From 6d78fbe5c5945701b6bd30101da5ce16164f4e6b Mon Sep 17 00:00:00 2001 From: Deepesh Varatharajan Date: Thu, 27 Mar 2025 02:06:05 -0700 Subject: rust: Upgrade 1.83.0->1.84.1 Rust stable version updated to 1.84.1. https://blog.rust-lang.org/2025/01/30/Rust-1.84.1.html Renamed and modified the below patch to adapt the new version. rv32-cargo-rustix-0.38.37-fix.patch->rv32-cargo-rustix-0.38.38-fix.patch Modified the below patches to adapt the new version. repro-issue-fix-with-cc-crate-hashmap.patch revert-link-std-statically-in-rustc_driver-feature.patch Dropped the below patches : 0001-NFC-fix-build-failure-100993.patch https://github.com/llvm/llvm-project/commit/6ee49080e4bb43efe7ede10bed15935853bbd434 revert-Zdual-proc-macros-additional-check.patch Issue is fixed in rust-master and the fix is backported in the subsequent patch of the series. (From OE-Core rev: 4265f668de8c6708cb3a003ad655559031724149) Signed-off-by: Deepesh Varatharajan Signed-off-by: Richard Purdie --- ...revert-Zdual-proc-macros-additional-check.patch | 43 ---------------------- 1 file changed, 43 deletions(-) delete mode 100644 meta/recipes-devtools/rust/files/revert-Zdual-proc-macros-additional-check.patch (limited to 'meta/recipes-devtools/rust/files/revert-Zdual-proc-macros-additional-check.patch') diff --git a/meta/recipes-devtools/rust/files/revert-Zdual-proc-macros-additional-check.patch b/meta/recipes-devtools/rust/files/revert-Zdual-proc-macros-additional-check.patch deleted file mode 100644 index 58e77e4e6e..0000000000 --- a/meta/recipes-devtools/rust/files/revert-Zdual-proc-macros-additional-check.patch +++ /dev/null @@ -1,43 +0,0 @@ -rust: Fix build failure for v1.83 when lib32 enabled - -Because of the following commit , -https://github.com/rust-lang/rust/commit/68034f837a39387e49fc7d7c5b088f5372a1127e -when we enable lib32, getting build failure because there is a check for target -support for "-Zdual-proc-macros" flag not functioning properly when lib32 is -enabled in the build environment. So for now reverting this commit and bring -back the previous behavior, where the "-Zdual-proc-macros" flag is always -added for building proc macros, regardless of the target architecture's support. -This would bypass the check introduced in the patch, allowing the build to -proceed without error, even when building for a 64-bit architecture with lib32 enabled. - -Upstream-Status: Pending - -Signed-off-by: Deepesh Varatharajan -diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs -index 9ac0b0a01f..b1374042fb 100644 ---- a/src/bootstrap/src/core/builder.rs -+++ b/src/bootstrap/src/core/builder.rs -@@ -1701,21 +1701,8 @@ impl<'a> Builder<'a> { - // Build proc macros both for the host and the target unless proc-macros are not - // supported by the target. - if target != compiler.host && cmd_kind != Kind::Check { -- let error = command(self.rustc(compiler)) -- .arg("--target") -- .arg(target.rustc_target_arg()) -- .arg("--print=file-names") -- .arg("--crate-type=proc-macro") -- .arg("-") -- .run_capture(self) -- .stderr(); -- let not_supported = error -- .lines() -- .any(|line| line.contains("unsupported crate type `proc-macro`")); -- if !not_supported { -- cargo.arg("-Zdual-proc-macros"); -- rustflags.arg("-Zdual-proc-macros"); -- } -+ cargo.arg("-Zdual-proc-macros"); -+ rustflags.arg("-Zdual-proc-macros"); - } - } - } -- cgit v1.2.3-54-g00ecf