commit: 7d88e2a4cc656f25f033e88f8b2d3307f4b31ee7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Oct 31 02:54:26 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 31 02:54:53 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=7d88e2a4
Merge branch 'master' into 1.91 Signed-off-by: Sam James <sam <AT> gentoo.org> 1.90.0-compiler-musl-dynamic-linking.patch | 24 +--- 1.90.0/1.90.0-bootstrap-linker-features.patch | 187 ++++++++++++++++++++++++++ 2 files changed, 193 insertions(+), 18 deletions(-) diff --cc 1.90.0-compiler-musl-dynamic-linking.patch index ca69a59,9c4256e..6b22209 --- a/1.90.0-compiler-musl-dynamic-linking.patch +++ b/1.90.0-compiler-musl-dynamic-linking.patch @@@ -1,11 -1,9 +1,12 @@@ - From 5ff93d7c3144672785f894d6888f053329147fbb Mon Sep 17 00:00:00 2001 + From 140cc19cf02c3b070e7f3e2aa2c9223e78ab0fca Mon Sep 17 00:00:00 2001 + Message-ID: <140cc19cf02c3b070e7f3e2aa2c9223e78ab0fca.1761003588.git....@gentoo.org> From: Matt Jolly <[email protected]> -Date: Tue, 29 Jul 2025 14:54:14 +1000 +Date: Thu, 2 Oct 2025 16:31:00 +1000 Subject: [PATCH] compiler: musl: dynamic linking by default +Recent upstream work (1.90.0) has enabled dynamic linking for all tier 3 +musl targets, but we want it everywhere. + Signed-off-by: Matt Jolly <[email protected]> --- .../src/spec/targets/aarch64_unknown_linux_musl.rs | 3 --- @@@ -16,13 -14,12 +17,12 @@@ .../src/spec/targets/armv7_unknown_linux_musleabihf.rs | 3 +-- .../rustc_target/src/spec/targets/i586_unknown_linux_musl.rs | 2 -- .../rustc_target/src/spec/targets/i686_unknown_linux_musl.rs | 2 -- - .../src/spec/targets/mips64el_unknown_linux_muslabi64.rs | 3 +-- .../src/spec/targets/powerpc64le_unknown_linux_musl.rs | 3 +-- .../rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs | 2 -- - 11 files changed, 7 insertions(+), 23 deletions(-) + 10 files changed, 6 insertions(+), 21 deletions(-) diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_musl.rs -index 478726fbef6..b7b345e568b 100644 +index 478726fbe..b7b345e56 100644 --- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_musl.rs +++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_musl.rs @@ -14,9 +14,6 @@ pub(crate) fn target() -> Target { @@@ -130,22 -127,8 +130,8 @@@ index 47a7eb3d5..da1026485 10064 // The unwinder used by i686-unknown-linux-musl, the LLVM libunwind // implementation, apparently relies on frame pointers existing... somehow. - diff --git a/compiler/rustc_target/src/spec/targets/mips64el_unknown_linux_muslabi64.rs b/compiler/rustc_target/src/spec/targets/mips64el_unknown_linux_muslabi64.rs - index d42e097b0..328c8a3cc 100644 - --- a/compiler/rustc_target/src/spec/targets/mips64el_unknown_linux_muslabi64.rs - +++ b/compiler/rustc_target/src/spec/targets/mips64el_unknown_linux_muslabi64.rs - @@ -5,8 +5,7 @@ pub(crate) fn target() -> Target { - base.cpu = "mips64r2".into(); - base.features = "+mips64r2,+xgot".into(); - base.max_atomic_width = Some(64); - - // FIXME(compiler-team#422): musl targets should be dynamically linked by default. - - base.crt_static_default = true; - + base.crt_static_default = false; - Target { - // LLVM doesn't recognize "muslabi64" yet. - llvm_target: "mips64el-unknown-linux-musl".into(), diff --git a/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_musl.rs -index 26ee6a68c6a..6fc67dfdcb6 100644 +index 26ee6a68c..6fc67dfdc 100644 --- a/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_musl.rs +++ b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_musl.rs @@ -8,8 +8,7 @@ pub(crate) fn target() -> Target {
