commit: ce668d532e4b05aa72cfba320887e6bcc9bbcf51 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Dec 11 21:17:26 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Dec 11 21:17:26 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=ce668d53
Rebase 1.92.0-compiler-musl-dynamic-linking.patch for 1.92.0 Signed-off-by: Sam James <sam <AT> gentoo.org> 1.92.0-compiler-musl-dynamic-linking.patch | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/1.92.0-compiler-musl-dynamic-linking.patch b/1.92.0-compiler-musl-dynamic-linking.patch index 40fb8cb..72b9157 100644 --- a/1.92.0-compiler-musl-dynamic-linking.patch +++ b/1.92.0-compiler-musl-dynamic-linking.patch @@ -1,4 +1,5 @@ -From f78561c758080c5ff5146c2b7129a4337efc7313 Mon Sep 17 00:00:00 2001 +From a0774b90e8b64b230a451a18bde1c6846cdba578 Mon Sep 17 00:00:00 2001 +Message-ID: <a0774b90e8b64b230a451a18bde1c6846cdba578.1765487810.git....@gentoo.org> From: Matt Jolly <[email protected]> Date: Tue, 29 Jul 2025 14:54:14 +1000 Subject: [PATCH] compiler: musl: dynamic linking by default @@ -18,7 +19,7 @@ Signed-off-by: Matt Jolly <[email protected]> 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 6ba5112342c..b66c2257f3e 100644 +index 478726fbef6..b7b345e568b 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 { @@ -32,7 +33,7 @@ index 6ba5112342c..b66c2257f3e 100644 llvm_target: "aarch64-unknown-linux-musl".into(), metadata: TargetMetadata { diff --git a/compiler/rustc_target/src/spec/targets/arm_unknown_linux_musleabi.rs b/compiler/rustc_target/src/spec/targets/arm_unknown_linux_musleabi.rs -index 25ef767c4b1..a580890c8fb 100644 +index 3919a5e0771..b623f9aef5d 100644 --- a/compiler/rustc_target/src/spec/targets/arm_unknown_linux_musleabi.rs +++ b/compiler/rustc_target/src/spec/targets/arm_unknown_linux_musleabi.rs @@ -20,8 +20,7 @@ pub(crate) fn target() -> Target { @@ -46,7 +47,7 @@ index 25ef767c4b1..a580890c8fb 100644 }, } diff --git a/compiler/rustc_target/src/spec/targets/arm_unknown_linux_musleabihf.rs b/compiler/rustc_target/src/spec/targets/arm_unknown_linux_musleabihf.rs -index 76051403a55..21628c036dc 100644 +index ca52e5b3ca6..885bcb6dd8c 100644 --- a/compiler/rustc_target/src/spec/targets/arm_unknown_linux_musleabihf.rs +++ b/compiler/rustc_target/src/spec/targets/arm_unknown_linux_musleabihf.rs @@ -20,8 +20,7 @@ pub(crate) fn target() -> Target { @@ -60,7 +61,7 @@ index 76051403a55..21628c036dc 100644 }, } diff --git a/compiler/rustc_target/src/spec/targets/armv5te_unknown_linux_musleabi.rs b/compiler/rustc_target/src/spec/targets/armv5te_unknown_linux_musleabi.rs -index 2daf2ab4d8f..2910cbcb9c1 100644 +index e675739629b..4287b0f2611 100644 --- a/compiler/rustc_target/src/spec/targets/armv5te_unknown_linux_musleabi.rs +++ b/compiler/rustc_target/src/spec/targets/armv5te_unknown_linux_musleabi.rs @@ -20,8 +20,7 @@ pub(crate) fn target() -> Target { @@ -74,7 +75,7 @@ index 2daf2ab4d8f..2910cbcb9c1 100644 }, } diff --git a/compiler/rustc_target/src/spec/targets/armv7_unknown_linux_musleabi.rs b/compiler/rustc_target/src/spec/targets/armv7_unknown_linux_musleabi.rs -index 9bf0b4fd7e4..b2f29501993 100644 +index 42fbf6f4861..d9483fd163b 100644 --- a/compiler/rustc_target/src/spec/targets/armv7_unknown_linux_musleabi.rs +++ b/compiler/rustc_target/src/spec/targets/armv7_unknown_linux_musleabi.rs @@ -24,8 +24,7 @@ pub(crate) fn target() -> Target { @@ -88,7 +89,7 @@ index 9bf0b4fd7e4..b2f29501993 100644 }, } diff --git a/compiler/rustc_target/src/spec/targets/armv7_unknown_linux_musleabihf.rs b/compiler/rustc_target/src/spec/targets/armv7_unknown_linux_musleabihf.rs -index 9b5fcd87b12..591e1850cd0 100644 +index a3ac0223c84..5ac902bf350 100644 --- a/compiler/rustc_target/src/spec/targets/armv7_unknown_linux_musleabihf.rs +++ b/compiler/rustc_target/src/spec/targets/armv7_unknown_linux_musleabihf.rs @@ -23,8 +23,7 @@ pub(crate) fn target() -> Target { @@ -114,10 +115,10 @@ index 42babb90da7..87628fcad4c 100644 base } diff --git a/compiler/rustc_target/src/spec/targets/i686_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/i686_unknown_linux_musl.rs -index 5c85a3e1382..c516f4915c3 100644 +index 47a7eb3d597..da1026485bd 100644 --- a/compiler/rustc_target/src/spec/targets/i686_unknown_linux_musl.rs +++ b/compiler/rustc_target/src/spec/targets/i686_unknown_linux_musl.rs -@@ -12,8 +12,6 @@ pub(crate) fn target() -> Target { +@@ -11,8 +11,6 @@ pub(crate) fn target() -> Target { base.max_atomic_width = Some(64); base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m32", "-Wl,-melf_i386"]); base.stack_probes = StackProbeType::Inline; @@ -127,7 +128,7 @@ index 5c85a3e1382..c516f4915c3 100644 // 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/powerpc64le_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_musl.rs -index 38e3d09c2c3..53c6b702315 100644 +index 26ee6a68c6a..6fc67dfdcb6 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 { @@ -137,11 +138,11 @@ index 38e3d09c2c3..53c6b702315 100644 - // FIXME(compiler-team#422): musl targets should be dynamically linked by default. - base.crt_static_default = true; + base.crt_static_default = false; - base.abi = Abi::ElfV2; + base.abi = "elfv2".into(); base.llvm_abiname = "elfv2".into(); diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs -index ee883532ad4..f65de3ec9bb 100644 +index cc5f8886240..0203c776a01 100644 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs @@ -16,8 +16,6 @@ pub(crate) fn target() -> Target { @@ -154,5 +155,5 @@ index ee883532ad4..f65de3ec9bb 100644 Target { llvm_target: "x86_64-unknown-linux-musl".into(), -- -2.51.2 +2.52.0
