rust: Upgrade 1.84.1->1.85.0

Rust stable version updated to 1.85.0
https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html

Some of the major updates:

- Update LIC_FILES_CHKSUM in libstd-rs and rust recipes.
License-Update: Unicode license text is updated to Unicode-3.0 License.
rust-lang/rust@6d2a3e9
[RP: Update LICENSE to reference Unicode-3.0]

- Pass '-Zforce-unstable-if-unmarked' to RUSTFLAGS in libstd-rs.bb
Fix: rust-lang/rust#133857 (comment)

- Downgrade bootstrap cc version causing bootstrap to fail on custom targets. (Backported from v1.85.1)
Fix: rust-lang/rust@e4ca11f

- Explicitly set float ABI for all ARM 32 bits targets.
Fix: rust-lang/rust@a51fefc

- Rust v1.85.0 tarball doesn't ship gcc tree.
Drop "remove_gcc_directory" postfunc which removed it and prevented the bloat.
Fix: rust-lang/rust@13c3f9b

Adapted 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

Dropped patches:
  fix-tidy-check-failure.patch since it's merged with v1.85.0.

(From OE-Core rev: 7fc116527ca972730031018ead214f8116f508d3)

Signed-off-by: Yash Shinde <[email protected]>
Signed-off-by: Richard Purdie <[email protected]>

Author: Yashinde145

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

@@ -391,6 +391,11 @@ def rust_gen_target(d, thing, wd, arch):
     tspec['cpu'] = cpu
     if features != "":
         tspec['features'] = features
+    fpu = d.getVar('TARGET_FPU')
+    if fpu == "soft":
+        tspec['llvm-floatabi'] = "soft"
+    elif fpu == "hard":
+        tspec['llvm-floatabi'] = "hard"
     tspec['dynamic-linking'] = True
     tspec['executables'] = True
     tspec['linker-is-gnu'] = True

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 renamed to 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 <Yash.Shinde@windriver.com>
+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() {
  }
 

meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch

@@ -2,7 +2,7 @@ SUMMARY = "Rust standard libaries"
 HOMEPAGE = "http://www.rust-lang.org"
 SECTION = "devel"
 LICENSE = "(MIT | Apache-2.0) & Unicode-TOU"
-LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=c2cccf560306876da3913d79062a54b9"
+LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=9c0fae516fe8aaea2fb601db4800daf7"
 
 require rust-source.inc
 
@@ -24,6 +24,8 @@ DEPENDS:remove:riscv64 = "libunwind"
 
 # Embed bitcode in order to allow compiling both with and without LTO
 RUSTFLAGS += "-Cembed-bitcode=yes"
+# Ensure that user code can't access the dependencies of the standard library
+RUSTFLAGS += "-Zforce-unstable-if-unmarked"
 # Needed so cargo can find libbacktrace
 RUSTFLAGS += "-L ${STAGING_LIBDIR} -C link-arg=-Wl,-soname,libstd.so"
 

meta/recipes-devtools/rust/files/revert-link-std-statically-in-rustc_driver-feature.patch

@@ -1,59 +1,59 @@
 ## This is information on the rust-snapshot (binary) used to build our current release.
-## snapshot info is taken from rust/src/stage0.json
+## snapshot info is taken from rust/src/stage0
 ## Rust is self-hosting and bootstraps itself with a pre-built previous version of itself.
 ## The exact (previous) version that has been used is specified in the source tarball.
 ## The version is replicated here.
 
-SNAPSHOT_VERSION = "1.83.0"
+SNAPSHOT_VERSION = "1.84.0"
 
-SRC_URI[cargo-snapshot-aarch64.sha256sum] = "5b96aba48790acfacea60a6643a4f30d7edc13e9189ad36b41bbacdad13d49e1"
-SRC_URI[clippy-snapshot-aarch64.sha256sum] = "08cabe06aa116b78b351ab1ca1d7ccf0dc18d97d999f3e0bf228021291314d5d"
-SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "8804f673809c5c3db11ba354b5cf9724aed68884771fa32af4b3472127a76028"
-SRC_URI[rustc-snapshot-aarch64.sha256sum] = "aa5d075f9903682e5171f359948717d32911bed8c39e0395042e625652062ea9"
+SRC_URI[rustc-snapshot-aarch64.sha256sum] = "9f5650aece53e083b933a57e5a8e0e2db4479f52ec897d5b6d0f77be6cd50498"
+SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "023f0b6153b23ac0e9686c2ab95bc393ee3e295b166bb36de3b4dfb53e3913e0"
+SRC_URI[cargo-snapshot-aarch64.sha256sum] = "68d4ad239b6d1e810e7b8591636dc408cb2c1e89661329fed906febf9c0a9d98"
+SRC_URI[clippy-snapshot-aarch64.sha256sum] = "6022245416a988b9952f36bf20f62de0c2f3337bd150e34439ea6651592ac8ca"
 
-SRC_URI[cargo-snapshot-i686.sha256sum] = "906976544e7f6bac7ee4f54eae56f3162fe7dc06744cf84149699be57bd0b4c7"
-SRC_URI[clippy-snapshot-i686.sha256sum] = "4fb7ed75796336f4972675225ac4e1f2a8ba58ddf350dd51f1d482c7084b0c6f"
-SRC_URI[rust-std-snapshot-i686.sha256sum] = "d6763f3ff18fa6da4455058fcb84ef19c2586fca02badab466200d90fa4184d4"
-SRC_URI[rustc-snapshot-i686.sha256sum] = "421fba974b062b1b9749792466214e563589a05f888673989b0208b1dc66ac43"
+SRC_URI[rustc-snapshot-i686.sha256sum] = "f0bc277e8e8c072d20ee91784f919c08b34a65ab56b67bcd2bb98a009cdcf97c"
+SRC_URI[rust-std-snapshot-i686.sha256sum] = "e710100be26e742733d445722a37227381f1ec2010664ece85489bc598d70456"
+SRC_URI[cargo-snapshot-i686.sha256sum] = "3a20231475b75f2f6ad0f7c5de283c5706403b41e941d3f1ca6cccfbced214c6"
+SRC_URI[clippy-snapshot-i686.sha256sum] = "8b5bdd84b9128abc6d61bc1acb60e55eab90e063c7057371b4e6f79aaa1acb9b"
 
-SRC_URI[cargo-snapshot-loongarch64.sha256sum] = "c7b537bc2bb4b685eae80503657b89bf59c51303c90ebc042b0fb39b21cf252d"
-SRC_URI[clippy-snapshot-loongarch64.sha256sum] = "895d1f9cacce934f0e72e06df9f4653c48d2df4a2070206a6b8b21908ce07d1f"
-SRC_URI[rust-std-snapshot-loongarch64.sha256sum] = "5804d1e989c03620b3bedf0ce43c98395fcfae1d6923446c31ae5562ee56916e"
-SRC_URI[rustc-snapshot-loongarch64.sha256sum] = "b3afba9debf0e153f5dc69ecb0b020c0d6159002bd3b4b845c6797480c07d50e"
+SRC_URI[rustc-snapshot-loongarch64.sha256sum] = "33ecfb62afce6e30864f07b4e3b76ac6d9f603a3626e5228ad0d59a7ee263cc1"
+SRC_URI[rust-std-snapshot-loongarch64.sha256sum] = "763b93ca08028a1e63a8a3754ac6118b2659022538e5e33675f2d7620488cd57"
+SRC_URI[cargo-snapshot-loongarch64.sha256sum] = "1531b9f3d09983c43f54d7e5ced6b452044e82b24609532e8cee345656e5d8a4"
+SRC_URI[clippy-snapshot-loongarch64.sha256sum] = "80719f10010eaf6a26ba7b2f8c5c7bce3a78fd838cbbe17c00a4e3e7cd45fe5e"
 
-SRC_URI[cargo-snapshot-powerpc.sha256sum] = "05c353dfeaf51e960e5f916e345f0f0d0497851428a3faa997a62a8563e63109"
-SRC_URI[clippy-snapshot-powerpc.sha256sum] = "0e93e1bac1c195d89b9b94a900ffa3191228c6c66f5a5bf2f656a1a72fdfa163"
-SRC_URI[rust-std-snapshot-powerpc.sha256sum] = "17978a56a8efef883485201dc701ed2ff13530511578da240840f12bdc55cb27"
-SRC_URI[rustc-snapshot-powerpc.sha256sum] = "f843dadf7f1f0148e78480dfcdecaa8eef15aa8382576ff41c82799c6233039b"
+SRC_URI[rustc-snapshot-powerpc.sha256sum] = "ac99e907c9819b61de94a6c12b64256661e5d76c53f3ed25246b46741d1dc973"
+SRC_URI[rust-std-snapshot-powerpc.sha256sum] = "fdbb75060e59ad59273a8ef11fc2ad61837539686df0e8dfe46107e1b15ab90a"
+SRC_URI[cargo-snapshot-powerpc.sha256sum] = "dedcb36320cfa924e2d21552057f88ee8a30c0424802015494c2f6237150ec55"
+SRC_URI[clippy-snapshot-powerpc.sha256sum] = "de2413ae321d2bccf77c77acb1e9775b63eca1993ee1450e65e388f029565a51"
 
-SRC_URI[cargo-snapshot-powerpc64.sha256sum] = "889f2cc33c77a34ae962629f0469c6138a5d4d6efeb5f383a87443181845a771"
-SRC_URI[clippy-snapshot-powerpc64.sha256sum] = "35be1a0ef9241785210447126a18fccb4114fe54776f3e20e21d89c025b05498"
-SRC_URI[rust-std-snapshot-powerpc64.sha256sum] = "adcefafca7a7b7ddb220d18e31afdfd4c547f87b1515e45098513b2d468043e7"
-SRC_URI[rustc-snapshot-powerpc64.sha256sum] = "267089f5c1d7364ccf56f2246f37d668d386edcf2154c985a6e51c928e50dde6"
+SRC_URI[rustc-snapshot-powerpc64.sha256sum] = "1f5ff831c9fd97d7d306eb7d99186b9e49f35527144aaabd43f67f04449cd732"
+SRC_URI[rust-std-snapshot-powerpc64.sha256sum] = "f2819f8ce1ae41c2c2bcf40fc90d6b1a5d340d3e9558267d464730a797122bf5"
+SRC_URI[cargo-snapshot-powerpc64.sha256sum] = "09d9954bf817404c08a8ac952afe1e086ad11fe20d07522a4bde5f26bf7fb5d2"
+SRC_URI[clippy-snapshot-powerpc64.sha256sum] = "a34cde35f254210cbb212c3fa85411efaa8e70d600d2c2404b7b319eae9b5be6"
 
-SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "7a1b7b1d18f562be446db8880fbcc26f4f5581c273a5d547231e8da3d06e3f39"
-SRC_URI[clippy-snapshot-powerpc64le.sha256sum] = "7f6a3b6c99a38a0a6722652c8b342b16397000f198ff5b8ae5c042336a88db89"
-SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = "d39fdf0954e57fa9dd0763d58e7897bbb93265ab217e5fef14a11fafe2f706a3"
-SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "5978f9b3246c71cefb5266e56403c1071fed70d71019bd839c4601d7b6f9eac9"
+SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "1f6aa28f848b24d4589277b04535ad0258e72b5fa78a4a85ba6d18db95636d69"
+SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = "db731e894cce9973ab2b41109c9097d0fc6a49c0d45a0d333bd1547d2c7485a1"
+SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "7dc351327de2567cce2a3387f110cce1db20c68fc529353c5cdef2eada5dbfd8"
+SRC_URI[clippy-snapshot-powerpc64le.sha256sum] = "b53cb58c719b84044de62851b6214db8d504f57ad71e81b373d7dea0393146d8"
 
-SRC_URI[cargo-snapshot-riscv64gc.sha256sum] = "ddfcc41a419f1d1a7637a972932d37e3c5487343f9be3deaeacf06027fbb0567"
-SRC_URI[clippy-snapshot-riscv64gc.sha256sum] = "feea5dae4dfb65b608590b5e7b5c693da12f8e559e3b1a7b6b19dbae580b0ede"
-SRC_URI[rust-std-snapshot-riscv64gc.sha256sum] = "6a5467d1f4b8040f19c94ca332063cad57581d6cfd1f15543da5a67d4d244f70"
-SRC_URI[rustc-snapshot-riscv64gc.sha256sum] = "3f0c56d778985f69aff3ae58aa157025ad807d8b5821b8f98108be6f8a283e21"
+SRC_URI[rustc-snapshot-riscv64gc.sha256sum] = "c0eaf824c7789c94901f895792333595fe131e43f097bcf5987301cc1b14c3f0"
+SRC_URI[rust-std-snapshot-riscv64gc.sha256sum] = "451580f9cdc47eef4efb0986b1960a8f9c4fb0959f81b77eb6292e6bcff9fc64"
+SRC_URI[cargo-snapshot-riscv64gc.sha256sum] = "3a850b74bdf2c3a5912e9f1ea32aaf1c9ac7c5f89c1c0bcf421b961195833992"
+SRC_URI[clippy-snapshot-riscv64gc.sha256sum] = "fb8c9d489e10a961f9faa550980069738b5f0f68740e34d7b3ee46a262b53af7"
 
-SRC_URI[cargo-snapshot-s390x.sha256sum] = "2044ee69985da536dc1786e949828eba88516ee01ad88a4c36d753c471143ccf"
-SRC_URI[clippy-snapshot-s390x.sha256sum] = "fdab081200826ba47929030cd7e9d82c843122fdd26fc3edff9e52a2d91f68b0"
-SRC_URI[rust-std-snapshot-s390x.sha256sum] = "d1e1af8622d59c3351046ded96af4eeecb3db2f4f7527249eaf1acc917e3f2e8"
-SRC_URI[rustc-snapshot-s390x.sha256sum] = "ccf73e94f3f60dfddc26640df95dbb82939aa572d50cda0aeafaa36b47b28f07"
+SRC_URI[rustc-snapshot-s390x.sha256sum] = "7dbc2fc2c04e820f636bfc74093396c55df0296f7ee4f0547bb849d9a9f05fe0"
+SRC_URI[rust-std-snapshot-s390x.sha256sum] = "5208f45cec5f3600f2cbc11d1796bc217f09e9c922689c8e4f0cc3f2b83ebb74"
+SRC_URI[cargo-snapshot-s390x.sha256sum] = "bdf944ff5c0b97e8b64093fff8d1f63926df86b5e98f91d30c7bd844c6efa20f"
+SRC_URI[clippy-snapshot-s390x.sha256sum] = "b02a586369e6edebb0f0608e396472d1867419213fd01ba32f3c847e4c5a3c07"
 
-SRC_URI[cargo-snapshot-x86_64.sha256sum] = "de834a4062d9cd200f8e0cdca894c0b98afe26f1396d80765df828880a39b98c"
-SRC_URI[clippy-snapshot-x86_64.sha256sum] = "ef6c05abcfd861ff0bca41d408e126dda195dc966ee35abee57645a12d418f5b"
-SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "c88fe6cb22f9d2721f26430b6bdd291e562da759e8629e2b4c7eb2c7cad705f2"
-SRC_URI[rustc-snapshot-x86_64.sha256sum] = "6ec40e0405c8cbed3b786a97d374c144b012fc831b7c22b535f8ecb524f495ad"
+SRC_URI[rustc-snapshot-x86_64.sha256sum] = "a1737d86f80b31a6d48a6726726275dc068ecb930c9635b13aa59999486de837"
+SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "770237080b9310d126350c3bd70820bd91064c2e96c29ab5f2e002b31b5bd067"
+SRC_URI[cargo-snapshot-x86_64.sha256sum] = "6c2371488db92a09cd50a1b4045c022f3cf2c643285b3b21105ab5f9b64fd6b6"
+SRC_URI[clippy-snapshot-x86_64.sha256sum] = "1db0212c08e126bf6ee28a0d363c5d6859fe357aa9e91d0247059397dbe7e1fd"
 
-SRC_URI[rust-std-snapshot-i586.sha256sum] = "7948ff50f7e83a20deba9d4f55170f7e3b0d805e80049f38b19f41580a9d7bb1"
+SRC_URI[rust-std-snapshot-i586.sha256sum] = "a877622fbbfa58304c34372d369e95db106cc35758ca59053144bf7d86fbf3fc"
 
-SRC_URI[rust-std-snapshot-sparc64.sha256sum] = "e8684ba5d337dbb0594cdc8e4e8ffa11d7ac8e48b2f294019e042e341fa9a869"
+SRC_URI[rust-std-snapshot-sparc64.sha256sum] = "ecd1662d6cbbb62984ab31ae787442f1ab32caf6bc17260d407b3a94b434ad32"
 
 SRC_URI += " \
     ${RUST_DIST_SERVER}/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \
@@ -62,6 +62,7 @@ SRC_URI += " \
 "
 
 RUST_DIST_SERVER = "https://static.rust-lang.org"
+
 RUST_STD_SNAPSHOT = "rust-std-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
 RUSTC_SNAPSHOT = "rustc-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
 CARGO_SNAPSHOT = "cargo-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"

meta/recipes-devtools/rust/files/rust-oe-selftest.patch

@@ -1,30 +1,19 @@
 RUST_VERSION ?= "${@d.getVar('PV').split('-')[0]}"
 
 SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;name=rust \
-            file://rv32-cargo-rustix-0.38.38-fix.patch;patchdir=${RUSTSRC} \
+            file://rv32-cargo-rustix-0.38.40-fix.patch;patchdir=${RUSTSRC} \
             file://rust-oe-selftest.patch;patchdir=${RUSTSRC} \
-	    file://repro-issue-fix-with-cc-crate-hashmap.patch;patchdir=${RUSTSRC} \
+            file://repro-issue-fix-with-cc-crate-hashmap.patch;patchdir=${RUSTSRC} \
             file://oeqa-selftest-Increase-timeout-in-process-sigpipe-ru.patch;patchdir=${RUSTSRC} \
             file://0001-src-core-build_steps-tool.rs-switch-off-lto-for-rust.patch;patchdir=${RUSTSRC} \
-	    file://revert-link-std-statically-in-rustc_driver-feature.patch;patchdir=${RUSTSRC} \
-	    file://Zdual-proc-macros-additional-check.patch;patchdir=${RUSTSRC} \
-	    file://fix-tidy-check-failure.patch;patchdir=${RUSTSRC} \
+            file://revert-link-std-statically-in-rustc_driver-feature.patch;patchdir=${RUSTSRC} \
+            file://Zdual-proc-macros-additional-check.patch;patchdir=${RUSTSRC} \
+            file://downgrade-bootstrap-cc.patch;patchdir=${RUSTSRC} \
 "
-SRC_URI[rust.sha256sum] = "e23ec747a06ffd3e94155046f40b6664ac152c9ee3c2adfd90353a7ccff24226"
+SRC_URI[rust.sha256sum] = "d542c397217b5ba5bac7eb274f5ca62d031f61842c3ba4cc5328c709c38ea1e7"
 
 RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
 
-#After updating to Rust 1.85 we can revert this removal of "src/gcc"
-remove_gcc_directory() {
-    # Ensure the gcc directory exists
-    gcc_dir="${RUSTSRC}/src/gcc"
-    if [ -d "$gcc_dir" ]; then
-        rm -rf "$gcc_dir"
-    fi
-}
-# Add postfunc to the do_unpack task
-do_unpack[postfuncs] += "remove_gcc_directory"
-
 UPSTREAM_CHECK_URI = "https://forge.rust-lang.org/infra/other-installation-methods.html"
 UPSTREAM_CHECK_REGEX = "rustc-(?P<pver>\d+(\.\d+)+)-src"
 

meta/recipes-devtools/rust/files/rv32-cargo-rustix-0.38.38-fix.patch

@@ -1,8 +1,8 @@
 SUMMARY = "Rust compiler and runtime libaries"
 HOMEPAGE = "http://www.rust-lang.org"
 SECTION = "devel"
-LICENSE = "(MIT | Apache-2.0) & Unicode-TOU"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=c2cccf560306876da3913d79062a54b9"
+LICENSE = "(MIT | Apache-2.0) & Unicode-3.0"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9c0fae516fe8aaea2fb601db4800daf7"
 
 inherit rust
 inherit cargo_common