rust: Upgrade 1.85.1->1.86.0

Rust stable version updated to 1.86.0.
https://blog.rust-lang.org/2025/04/03/Rust-1.86.0.html

* Add pkgconfig-native and openssl to resolve openssl-sys crate
dependency on pkg-config. As per rust document this is a required dependency.

Fixes:
| error: failed to run custom build command for `openssl-sys v0.9.106`
| Could not find openssl via pkg-config:
|   The pkg-config command could not be found.
|
|   Most likely, you need to install a pkg-config package for your OS.
|   Try `apt install pkg-config`, or `yum install pkg-config`,
|   or `pkg install pkg-config`, or `apk add pkgconfig` depending on your distribution

https://crates.io/crates/openssl-sys/0.9.108/dependencies
https://github.com/rust-lang/rust/blob/master/INSTALL.md#dependencies

* Add Ninja as a dependency for building Rust to prevent bootstrap
  build regression.

Fixes:
| Building LLD for x86_64-unknown-linux-gnu
|
| Couldn't find required command: ninja (or ninja-build)
|
| You should install ninja as described at
| <https://github.com/ninja-build/ninja/wiki/Pre-built-Ninja-packages>,
| or set `ninja = false` in the `[llvm]` section of `config.toml`.
| Alternatively, set `download-ci-llvm = true` in that `[llvm]` section
| to download LLVM rather than building it.

* Add bash to DEPENDS to resolve missing dependency for subtree-sync.sh
Fixes:
ERROR: rust-1.86.0-r0 do_package_qa: QA Issue: /usr/lib/rustlib/src/rust/library/portable-simd/subtree-sync.sh
contained in package rust requires /bin/bash, but no providers found in RDEPENDS:rust? [file-rdeps]

* Add do_install:append() task to remove cargo bin from rust native builds.
This resolves the following conflict:

Fixes:
ERROR: libstd-rs-1.86.0-r0 do_prepare_recipe_sysroot: The file /usr/bin/cargo is
installed by both rust-native and cargo-native, aborting

* Update Unicode-3.0 license checksums.
License-Update: Copyright and license files to distributions are updated.

rust-lang/rust@f9c1699
  It adds copyright and license files (including HTML versions) to distributions,
  aligns with license compliance tools like reuse, and ensures all required
  license texts are properly included and formatted.

* Disable building of extended Rust tools to reduce build time and filesystem usage.
  Update config.toml to disable building of extended Rust tools that are not required.
  This helps minimize unnecessary build time and filesystem usage.

* The "remote-test-server" bin is now generated in stage2-tools-bin dir
  rather than stage1. Update the test suite accordingly.

* Fix do_package QA issue by packing missing zsh files and directories:

Fixes:
do_package: QA Issue: rust: Files/directories were installed but not shipped in any package:
/usr/share/zsh
/usr/share/zsh/site-functions
/usr/share/zsh/site-functions/_cargo
Please set FILES such that these items are packaged. Alternatively if they are unneeded,
avoid installing them or delete them within do_install

* Install "llvm-tblgen" from native-sysroot to recipe sysroot to handle
  file not found error during rust builds:

Fixes:
/bin/sh: line 1:/home/poky/build/tmp/work/core2-64-poky-linux/rust/1.86.0/recipe-sysroot/usr/lib/llvm-rust/bin/llvm-tblgen:
No such file or directory

| make[2]: *** [COFF/CMakeFiles/COFFOptionsTableGen.dir/build.make:120: COFF/Options.inc] Error 127
| make[1]: *** [CMakeFiles/Makefile2:630: COFF/CMakeFiles/COFFOptionsTableGen.dir/all] Error 2
| make[1]: *** Waiting for unfinished jobs....

* From v1.86.0, a "self-contained" LLD is built as part of rust
 bootstrap build. This results in additional build time and
 installations. Disable rust-lld in config.toml to prevent it.

 References: rust-lang/rust#135001
             rust-lang/rust@8744b44

* Drop Zdual-proc-macros-additional-check.patch patch
 since it's merged with v1.86.0
 rust-lang/rust@139d6ba

* LTO config is applied to rustdoc from v1.86.0.
 Rebase 0001-src-core-build_steps-tool.rs-switch-off-lto-for-rust.patch
 which disables it to avoid suffixes in binaries causing non-reproducibility.
 rust-lang/rust@1fe351b

* Restrict tests using "//@only <target_arch>" to avoid failures on riscv64,
  which is now part of default AB testing. Since riscv64 is Tier 2
  with no automated testing, some tests may fail. This approach ensures tests continue
  running on supported architectures while skipping them on riscv64.
  https://doc.rust-lang.org/rustc/platform-support.html#tier-2-with-host-tools

Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Author: Yashinde145

meta/conf/distro/include/tcmode-default.inc

@@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
 GCCVERSION ?= "15.%"
 SDKGCCVERSION ?= "${GCCVERSION}"
 GLIBCVERSION ?= "2.41%"
-RUSTVERSION ?= "1.85.1%"
+RUSTVERSION ?= "1.86.0%"
 
 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"

meta/lib/oeqa/selftest/cases/rust.py

@@ -104,7 +104,7 @@ def test_rust(self, *args, **kwargs):
             # Copy remote-test-server to image through scp
             host_sys = get_bb_var("RUST_BUILD_SYS", "rust")
             ssh = SSHControl(ip=qemu.ip, logfile=qemu.sshlog, user="root")
-            ssh.copy_to(builddir + "/build/" + host_sys + "/stage1-tools-bin/remote-test-server","~/")
+            ssh.copy_to(builddir + "/build/" + host_sys + "/stage2-tools-bin/remote-test-server","~/")
             # Execute remote-test-server on image through background ssh
             command = '~/remote-test-server --bind 0.0.0.0:12345 -v'
             sshrun=subprocess.Popen(("ssh", '-o',  'UserKnownHostsFile=/dev/null', '-o',  'StrictHostKeyChecking=no', '-f', "root@%s" % qemu.ip, command), shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)

meta/recipes-devtools/rust/cargo_1.85.1.bb renamed to meta/recipes-devtools/rust/cargo_1.86.0.bb

@@ -24,23 +24,53 @@ diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core
 index 087df2f8a..00790affb 100644
 --- a/src/bootstrap/src/core/build_steps/tool.rs
 +++ b/src/bootstrap/src/core/build_steps/tool.rs
-@@ -635,7 +635,7 @@ impl Step for Rustdoc {
-         }
+@@ -1,14 +1,11 @@
+ use std::path::PathBuf;
+ use std::{env, fs};
 
-         // NOTE: Never modify the rustflags here, it breaks the build cache for other tools!
--        let cargo = prepare_tool_cargo(
-+        let mut cargo = prepare_tool_cargo(
-             builder,
-             build_compiler,
-             Mode::ToolRustc,
-@@ -645,6 +645,7 @@ impl Step for Rustdoc {
+-use crate::core::build_steps::compile::is_lto_stage;
+ use crate::core::build_steps::toolstate::ToolState;
+ use crate::core::build_steps::{compile, llvm};
+ use crate::core::builder;
+-use crate::core::builder::{
+-    Builder, Cargo as CargoCommand, RunConfig, ShouldRun, Step, cargo_profile_var,
+-};
+-use crate::core::config::{DebuginfoLevel, RustcLto, TargetSelection};
++use crate::core::builder::{Builder, Cargo as CargoCommand, RunConfig, ShouldRun, Step};
++use crate::core::config::{DebuginfoLevel, TargetSelection};
+ use crate::utils::channel::GitInfo;
+ use crate::utils::exec::{BootstrapCommand, command};
+ use crate::utils::helpers::{add_dylib_path, exe, t};
+@@ -658,19 +655,7 @@
              SourceType::InTree,
              features.as_slice(),
          );
+-
+-        // rustdoc is performance sensitive, so apply LTO to it.
+-        if is_lto_stage(&build_compiler) {
+-            let lto = match builder.config.rust_lto {
+-                RustcLto::Off => Some("off"),
+-                RustcLto::Thin => Some("thin"),
+-                RustcLto::Fat => Some("fat"),
+-                RustcLto::ThinLocal => None,
+-            };
+-            if let Some(lto) = lto {
+-                cargo.env(cargo_profile_var("LTO", &builder.config), lto);
+-            }
+-        }
 +        cargo.rustflag("-Clto=off");
 
          let _guard = builder.msg_tool(
              Kind::Build,
--- 
-2.39.5
-
+diff --git a/src/bootstrap/src/core/builder/mod.rs b/src/bootstrap/src/core/builder/mod.rs
+--- a/src/bootstrap/src/core/builder/mod.rs
++++ b/src/bootstrap/src/core/builder/mod.rs
+@@ -11,7 +11,7 @@
+ 
+ use clap::ValueEnum;
+ 
+-pub use self::cargo::{Cargo, cargo_profile_var};
++pub use self::cargo::Cargo;
+ pub use crate::Compiler;
+ use crate::core::build_steps::{
+     check, clean, clippy, compile, dist, doc, gcc, install, llvm, run, setup, test, tool, vendor,

meta/recipes-devtools/rust/files/0001-Define-more-ioctl-codes-on-riscv32gc-unknown-linux-g.patch

@@ -43,10 +43,10 @@ diff --git a/compiler/rustc_interface/src/tests.rs b/compiler/rustc_interface/sr
  fn test_can_print_warnings() {
      sess_and_cfg(&["-Awarnings"], |sess, _cfg| {
          assert!(!sess.dcx().can_emit_warnings());
-diff --git a/library/std/src/sync/poison/rwlock/tests.rs b/library/std/src/sync/poison/rwlock/tests.rs
+diff --git a/library/std/tests/sync/rwlock.rs b/library/std/tests/sync/rwlock.rs
 index 1a9d3d3f12f..0a9cfc48806 100644
---- a/library/std/src/sync/poison/rwlock/tests.rs
-+++ b/library/std/src/sync/poison/rwlock/tests.rs
+--- a/library/std/tests/sync/rwlock.rs
++++ b/library/std/tests/sync/rwlock.rs
 @@ -47,6 +47,7 @@ fn frob() {
  }
 
@@ -114,9 +114,9 @@ diff --git a/library/test/src/tests.rs b/library/test/src/tests.rs
  fn test_time_options_threshold() {
      let unit = TimeThreshold::new(Duration::from_millis(50), Duration::from_millis(100));
      let integration = TimeThreshold::new(Duration::from_millis(500), Duration::from_millis(1000));
-diff --git a/library/std/src/sync/poison/mutex/tests.rs b/library/std/src/sync/poison/mutex/tests.rs
---- a/library/std/src/sync/poison/mutex/tests.rs
-+++ b/library/std/src/sync/poison/mutex/tests.rs
+diff --git a/library/std/tests/sync/mutex.rs b/library/std/tests/sync/mutex.rs
+--- a/library/std/tests/sync/mutex.rs
++++ b/library/std/tests/sync/mutex.rs
 @@ -193,6 +193,7 @@
  }
 
@@ -125,9 +125,9 @@ diff --git a/library/std/src/sync/poison/mutex/tests.rs b/library/std/src/sync/p
  fn test_mutex_arc_poison_mapped() {
      let arc = Arc::new(Mutex::new(1));
      assert!(!arc.is_poisoned());
-diff --git a/library/std/src/sync/poison/mutex/tests.rs b/library/std/src/sync/poison/mutex/tests.rs
---- a/library/std/src/sync/poison/mutex/tests.rs
-+++ b/library/std/src/sync/poison/mutex/tests.rs
+diff --git a/library/std/tests/sync/mutex.rs b/library/std/tests/sync/mutex.rs
+--- a/library/std/tests/sync/mutex.rs
++++ b/library/std/tests/sync/mutex.rs
 @@ -272,6 +272,7 @@
  }
 
@@ -136,9 +136,9 @@ diff --git a/library/std/src/sync/poison/mutex/tests.rs b/library/std/src/sync/p
  fn panic_while_mapping_unlocked_poison() {
      let lock = Mutex::new(());
 
-diff --git a/library/std/src/sync/rwlock/tests.rs b/library/std/src/sync/poison/rwlock/tests.rs
---- a/library/std/src/sync/poison/rwlock/tests.rs
-+++ b/library/std/src/sync/poison/rwlock/tests.rs
+diff --git a/library/std/src/sync/rwlock/tests.rs b/library/std/tests/sync/rwlock.rs
+--- a/library/std/tests/sync/rwlock.rs
++++ b/library/std/tests/sync/rwlock.rs
 @@ -59,6 +59,7 @@ fn test_rw_arc_poison_wr() {
  }
 
@@ -163,10 +163,10 @@ diff --git a/library/std/src/sync/rwlock/tests.rs b/library/std/src/sync/poison/
  fn panic_while_mapping_write_unlocked_poison() {
      let lock = RwLock::new(());
 
-diff --git a/library/core/benches/num/int_log/mod.rs b/library/core/benches/num/int_log/mod.rs
+diff --git a/library/coretests/benches/num/int_log/mod.rs b/library/coretests/benches/num/int_log/mod.rs
 index 3807cd5d76c..018c5c04456 100644
---- a/library/core/benches/num/int_log/mod.rs
-+++ b/library/core/benches/num/int_log/mod.rs
+--- a/library/coretests/benches/num/int_log/mod.rs
++++ b/library/coretests/benches/num/int_log/mod.rs
 @@ -98,6 +98,7 @@ fn $random_small(bench: &mut Bencher) {
          }
 
@@ -175,34 +175,22 @@ index 3807cd5d76c..018c5c04456 100644
          fn $geometric(bench: &mut Bencher) {
              let bases: [$t; 16] = [2, 3, 4, 5, 7, 8, 9, 15, 16, 17, 31, 32, 33, 63, 64, 65];
              let base_and_numbers: Vec<($t, Vec<$t>)> = bases
-diff --git a/compiler/rustc_data_structures/src/tagged_ptr/copy/tests.rs b/compiler/rustc_data_structures/src/tagged_ptr/copy/tests.rs
+diff --git a/compiler/rustc_data_structures/src/tagged_ptr/tests.rs b/compiler/rustc_data_structures/src/tagged_ptr/tests.rs
 index 160af8a65d..686f4607bb 100644
---- a/compiler/rustc_data_structures/src/tagged_ptr/copy/tests.rs
-+++ b/compiler/rustc_data_structures/src/tagged_ptr/copy/tests.rs
+--- a/compiler/rustc_data_structures/src/tagged_ptr/tests.rs
++++ b/compiler/rustc_data_structures/src/tagged_ptr/tests.rs
 @@ -5,6 +5,7 @@ use crate::stable_hasher::{HashStable, StableHasher};
- use crate::tagged_ptr::{CopyTaggedPtr, Pointer, Tag, Tag2};
-
- #[test]
-+#[ignore]
- fn smoke() {
-     let value = 12u32;
-     let reference = &value;
-diff --git a/compiler/rustc_data_structures/src/tagged_ptr/drop/tests.rs b/compiler/rustc_data_structures/src/tagged_ptr/drop/tests.rs
-index 4d342c72cc..9a77f92616 100644
---- a/compiler/rustc_data_structures/src/tagged_ptr/drop/tests.rs
-+++ b/compiler/rustc_data_structures/src/tagged_ptr/drop/tests.rs
-@@ -4,6 +4,7 @@ use std::sync::Arc;
- use crate::tagged_ptr::{Pointer, Tag, Tag2, TaggedPtr};
+ }
 
  #[test]
 +#[ignore]
  fn smoke() {
      let value = 12u32;
      let reference = &value;
-diff --git a/library/std/src/thread/local/tests.rs b/library/std/src/thread/local/tests.rs
+diff --git a/library/std/tests/thread_local/tests.rs b/library/std/tests/thread_local/tests.rs
 index 9d4f52a092..d425e5f7b7 100644
---- a/library/std/src/thread/local/tests.rs
-+++ b/library/std/src/thread/local/tests.rs
+--- a/library/std/tests/thread_local/tests.rs
++++ b/library/std/tests/thread_local/tests.rs
 @@ -346,6 +346,7 @@ fn join_orders_after_tls_destructors() {
 
  // Test that thread::current is still available in TLS destructors.
@@ -242,3 +230,32 @@ index a05f274136..0e69b4cb98 100644
  fn sparse_inserts() {
      let cache: VecCache<u32, u8, u32> = VecCache::default();
      let end = if cfg!(target_pointer_width = "64") && cfg!(target_os = "linux") {
+diff --git a/tests/assembly/dwarf-mixed-versions-lto.rs b/tests/assembly/dwarf-mixed-versions-lto.rs
+index 5b8e5ff4f4a..e558fbd7bd7 100644
+--- a/tests/assembly/dwarf-mixed-versions-lto.rs
++++ b/tests/assembly/dwarf-mixed-versions-lto.rs
+@@ -1,6 +1,11 @@
+ // This test ensures that if LTO occurs between crates with different DWARF versions, we
+ // will choose the highest DWARF version for the final binary. This matches Clang's behavior.
+
++//@ only-x86
++//@ only-x86_64
++//@ only-arm
++//@ only-aarch64
++
+ //@ only-linux
+ //@ aux-build:dwarf-mixed-versions-lto-aux.rs
+ //@ compile-flags: -C lto -g -Zdwarf-version=5
+diff --git a/tests/codegen/dont-shuffle-bswaps.rs b/tests/codegen/dont-shuffle-bswaps.rs
+index 0e712bc3a4e..93965d990d0 100644
+--- a/tests/codegen/dont-shuffle-bswaps.rs
++++ b/tests/codegen/dont-shuffle-bswaps.rs
+@@ -1,3 +1,8 @@
++//@ only-x86
++//@ only-x86_64
++//@ only-arm
++//@ only-aarch64
++
+ //@ revisions: OPT2 OPT3
+ //@[OPT2] compile-flags: -Copt-level=2
+ //@[OPT3] compile-flags: -C opt-level=3

meta/recipes-devtools/rust/files/0001-src-core-build_steps-tool.rs-switch-off-lto-for-rust.patch

@@ -2,7 +2,7 @@ SUMMARY = "Rust standard libaries"
 HOMEPAGE = "http://www.rust-lang.org"
 SECTION = "devel"
 LICENSE = "(MIT | Apache-2.0) & Unicode-3.0"
-LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=9c0fae516fe8aaea2fb601db4800daf7"
+LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=11a3899825f4376896e438c8c753f8dc"
 
 require rust-source.inc
 

meta/recipes-devtools/rust/files/Zdual-proc-macros-additional-check.patch

@@ -2,9 +2,9 @@ SUMMARY = "LLVM compiler framework (packaged with rust)"
 LICENSE ?= "Apache-2.0-with-LLVM-exception"
 HOMEPAGE = "http://www.rust-lang.org"
 
-# check src/llvm-project/llvm/CMakeLists.txt for llvm version in use
+# check src/llvm-project/cmake/Modules/LLVMVersion.cmake for llvm version in use
 #
-LLVM_RELEASE = "19.1.5"
+LLVM_RELEASE = "19.1.7"
 
 require rust-source.inc