rust: Upgrade 1.84.1->1.85.0

Some of the major changes with v1.85.0 are as follows:

- Update LIC_FILES_CHKSUM in libstd-rs and rust recipes.

- Pass '-Zforce-unstable-if-unmarked' to RUSTFLAGS in libstd-rs.bb
  to prevent user from accessing libstd's hashbrown dependency
  through 'hashbrown' crate.

  Fixes:
  error: `hashbrown::HashMap::<K, V, S>::with_hasher` cannot be (indirectly) exposed to stable
     --> std/src/collections/hash/map.rs:304:25

  error: `hashbrown::HashSet::<T, S>::with_hasher` cannot be (indirectly) exposed to stable
     --> std/src/collections/hash/set.rs:396:25

  rust-lang/rust#133857 (comment)

- Downgrade bootstrap cc version causing bootstrap to fail
  on custom targets. This is merged in v1.85.1 can be dropped
  when upgraded to it.

  rust-lang/rust@e4ca11f

- Explicitly set float ABI for all ARM 32 bits targets.
  A check was implemented to verify 'llvm_floatabi' in target config
  json file which yields the following error if not set.
  Set corresponding 'llvm_floatabi' values for them.

  Fixes:
  'error: Error loading target specification: ARM targets must
          specify their float ABI.'

  rust-lang/rust@a51fefc

- Rust v1.85.0 tarball doesn't ship gcc tree.
  Drop the unpack:append() which removed it and prevented the bloat.

  rust-lang/rust@13c3f9b

- Drop backported "fix-tidy-check-failure.patch" since it's merged with v1.85.0.

- Adapt the patch changes with v1.85.0:
  repro-issue-fix-with-cc-crate-hashmap.patch
  revert-link-std-statically-in-rustc_driver-feature.patch
  rust-oe-selftest.patch
  rv32-cargo-rustix-0.38.40-fix.patch

Release notes: https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html

Signed-off-by: Yash Shinde <[email protected]>
Signed-off-by: Harish Sadineni <[email protected]>

Author: Yashinde145

meta/classes-recipe/rust-target-config.bbclass

@@ -144,6 +144,8 @@ TARGET_POINTER_WIDTH[armv7-eabi] = "32"
 TARGET_C_INT_WIDTH[armv7-eabi] = "32"
 MAX_ATOMIC_WIDTH[armv7-eabi] = "64"
 FEATURES[armv7-eabi] = "+v7,+vfp2,+thumb2"
+ABI[armv7-eabi] = "eabihf"
+LLVM_FLOATABI[armv7-eabi] = "hard"
 
 ## aarch64-unknown-linux-{gnu, musl}
 DATA_LAYOUT[aarch64] = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32"
@@ -371,6 +373,8 @@ def rust_gen_target(d, thing, wd, arch):
     tspec['target-c-int-width'] = d.getVarFlag('TARGET_C_INT_WIDTH', arch_abi)
     tspec['target-endian'] = d.getVarFlag('TARGET_ENDIAN', arch_abi)
     tspec['arch'] = arch_to_rust_target_arch(rust_arch)
+    tspec['llvm-floatabi'] = d.getVarFlag('LLVM_FLOATABI', arch_abi)
+    tspec['abi'] = d.getVarFlag('ABI', arch_abi)
     if "baremetal" in d.getVar('TCLIBC'):
         tspec['os'] = "none"
     else:

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

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

meta/recipes-devtools/rust/cargo_1.84.1.bb meta/recipes-devtools/rust/cargo_1.85.0.bb

@@ -0,0 +1,41 @@
+Downgrade bootstrap cc version
+
+In rust v1.85.0, the upgraded cc version causes bootstrap
+to fail on custom targets. Downgrading the cc version fixes
+the error. This commit is merged with v1.85.1 and the patch
+can be dropped when upgraded to it.
+
+Upstream-Status: Backport [https://github.com/rust-lang/rust/pull/137460/commits/e4ca11f87ffca8c63aa56d45b46e62b6acc58bd7]
+
+Signed-off-by: Yash Shinde <[email protected]>
+diff --git a/src/bootstrap/Cargo.lock b/src/bootstrap/Cargo.lock
+index a47f3af60cb..890e64e2bab 100644
+--- a/src/bootstrap/Cargo.lock
++++ b/src/bootstrap/Cargo.lock
+@@ -88,9 +88,9 @@ dependencies = [
+
+ [[package]]
+ name = "cc"
+-version = "1.2.0"
++version = "1.1.22"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"
++checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"
+ dependencies = [
+  "shlex",
+ ]
+diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
+index ed51862390d..2c1d85b01e6 100644
+--- a/src/bootstrap/Cargo.toml
++++ b/src/bootstrap/Cargo.toml
+@@ -37,7 +37,9 @@ test = false
+ # Most of the time updating these dependencies requires modifications to the
+ # bootstrap codebase(e.g., https://github.com/rust-lang/rust/issues/124565);
+ # otherwise, some targets will fail. That's why these dependencies are explicitly pinned.
+-cc = "=1.2.0"
++#
++# Do not upgrade this crate unless https://github.com/rust-lang/cc-rs/issues/1317 is fixed.
++cc = "=1.1.22"
+ cmake = "=0.1.48"
+
+ build_helper = { path = "../build_helper" }

meta/recipes-devtools/rust/files/downgrade-bootstrap-cc.patch

@@ -40,9 +40,9 @@ index 39fa23766b..51d86b4009 100644
 
 -use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 +use rustc_data_structures::fx::FxHashMap;
- use rustc_hir::def_id::CrateNum;
+ use rustc_hir::def_id::{CrateNum, LOCAL_CRATE};
+ use rustc_index::IndexVec;
  use rustc_middle::bug;
- use rustc_middle::middle::dependency_format::{Dependencies, DependencyList, Linkage};
 @@ -161,44 +161,19 @@ fn calculate_type(tcx: TyCtxt<'_>, ty: CrateType) -> DependencyList {
          }
          Linkage::Dynamic | Linkage::IncludedFromDylib => {}

meta/recipes-devtools/rust/files/fix-tidy-check-failure.patch

@@ -150,26 +150,26 @@ index ac1a804cf9c..7c687982324 100644
  fn oneshot_multi_thread_recv_close_stress() {
      for _ in 0..stress_factor() {
          let (tx, rx) = channel::<i32>();
-diff --git a/library/std/src/sync/mutex/tests.rs b/library/std/src/sync/mutex/tests.rs
+diff --git a/library/std/src/sync/poison/mutex/tests.rs b/library/std/src/sync/poison/mutex/tests.rs
 index 1786a3c09ff..9dcead7092b 100644
---- a/library/std/src/sync/mutex/tests.rs
-+++ b/library/std/src/sync/mutex/tests.rs
+--- a/library/std/src/sync/poison/mutex/tests.rs
++++ b/library/std/src/sync/poison/mutex/tests.rs
 @@ -82,6 +82,7 @@ fn drop(&mut self) {
  }
 
  #[test]
 +#[ignore]
  fn test_into_inner_poison() {
-     let m = Arc::new(Mutex::new(NonCopy(10)));
-     let m2 = m.clone();
+     let m = new_poisoned_mutex(NonCopy(10));
+
 @@ -106,6 +107,7 @@ fn test_get_mut() {
  }
 
  #[test]
 +#[ignore]
  fn test_get_mut_poison() {
-     let m = Arc::new(Mutex::new(NonCopy(10)));
-     let m2 = m.clone();
+     let mut m = new_poisoned_mutex(NonCopy(10));
+
 @@ -146,6 +148,7 @@ fn test_mutex_arc_condvar() {
  }
 
@@ -194,10 +194,10 @@ index 1786a3c09ff..9dcead7092b 100644
  fn test_mutex_arc_access_in_unwind() {
      let arc = Arc::new(Mutex::new(1));
      let arc2 = arc.clone();
-diff --git a/library/std/src/sync/rwlock/tests.rs b/library/std/src/sync/rwlock/tests.rs
+diff --git a/library/std/src/sync/poison/rwlock/tests.rs b/library/std/src/sync/poison/rwlock/tests.rs
 index 1a9d3d3f12f..0a9cfc48806 100644
---- a/library/std/src/sync/rwlock/tests.rs
-+++ b/library/std/src/sync/rwlock/tests.rs
+--- a/library/std/src/sync/poison/rwlock/tests.rs
++++ b/library/std/src/sync/poison/rwlock/tests.rs
 @@ -47,6 +47,7 @@ fn frob() {
  }
 
@@ -244,16 +244,16 @@ index 1a9d3d3f12f..0a9cfc48806 100644
  #[test]
 +#[ignore]
  fn test_into_inner_poison() {
-     let m = Arc::new(RwLock::new(NonCopy(10)));
-     let m2 = m.clone();
+     let m = new_poisoned_rwlock(NonCopy(10));
+
 @@ -299,6 +305,7 @@ fn test_get_mut() {
  }
 
  #[test]
 +#[ignore]
  fn test_get_mut_poison() {
-     let m = Arc::new(RwLock::new(NonCopy(10)));
-     let m2 = m.clone();
+     let mut m = new_poisoned_rwlock(NonCopy(10));
+
 diff --git a/library/std/src/sys/pal/unix/process/process_unix/tests.rs b/library/std/src/sys/pal/unix/process/process_unix/tests.rs
 index 0a6c6ec19fc..bec257bc630 100644
 --- a/library/std/src/sys/pal/unix/process/process_unix/tests.rs
@@ -329,9 +329,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/mutex/tests.rs b/library/std/src/sync/mutex/tests.rs
---- a/library/std/src/sync/mutex/tests.rs
-+++ b/library/std/src/sync/mutex/tests.rs
+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
 @@ -193,6 +193,7 @@
  }
 
@@ -340,9 +340,9 @@ diff --git a/library/std/src/sync/mutex/tests.rs b/library/std/src/sync/mutex/te
  fn test_mutex_arc_poison_mapped() {
      let arc = Arc::new(Mutex::new(1));
      assert!(!arc.is_poisoned());
-diff --git a/library/std/src/sync/mutex/tests.rs b/library/std/src/sync/mutex/tests.rs
---- a/library/std/src/sync/mutex/tests.rs
-+++ b/library/std/src/sync/mutex/tests.rs
+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
 @@ -272,6 +272,7 @@
  }
 
@@ -351,9 +351,9 @@ diff --git a/library/std/src/sync/mutex/tests.rs b/library/std/src/sync/mutex/te
  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/rwlock/tests.rs
---- a/library/std/src/sync/rwlock/tests.rs
-+++ b/library/std/src/sync/rwlock/tests.rs
+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
 @@ -59,6 +59,7 @@ fn test_rw_arc_poison_wr() {
  }