commit: e1419fcd372e7bad2d1573ce432d268a77aec5f3 Author: Matt Jolly <kangie <AT> gentoo <DOT> org> AuthorDate: Wed Feb 11 07:47:23 2026 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Wed Feb 11 07:47:23 2026 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=e1419fcd
Update musl dynamic linking patch for 1.93.0 Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> ...h => 1.93.0-compiler-musl-dynamic-linking.patch | 42 +++------------------- 1 file changed, 4 insertions(+), 38 deletions(-) diff --git a/1.92.0-compiler-musl-dynamic-linking.patch b/1.93.0-compiler-musl-dynamic-linking.patch similarity index 65% rename from 1.92.0-compiler-musl-dynamic-linking.patch rename to 1.93.0-compiler-musl-dynamic-linking.patch index 40fb8cb..3dc1908 100644 --- a/1.92.0-compiler-musl-dynamic-linking.patch +++ b/1.93.0-compiler-musl-dynamic-linking.patch @@ -1,24 +1,9 @@ -From f78561c758080c5ff5146c2b7129a4337efc7313 Mon Sep 17 00:00:00 2001 +From 1084502e776bc82d638df918ce6955ea6b302e23 Mon Sep 17 00:00:00 2001 From: Matt Jolly <[email protected]> Date: Tue, 29 Jul 2025 14:54:14 +1000 Subject: [PATCH] compiler: musl: dynamic linking by default Signed-off-by: Matt Jolly <[email protected]> ---- - .../src/spec/targets/aarch64_unknown_linux_musl.rs | 3 --- - .../src/spec/targets/arm_unknown_linux_musleabi.rs | 3 +-- - .../src/spec/targets/arm_unknown_linux_musleabihf.rs | 3 +-- - .../src/spec/targets/armv5te_unknown_linux_musleabi.rs | 3 +-- - .../src/spec/targets/armv7_unknown_linux_musleabi.rs | 3 +-- - .../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/powerpc64le_unknown_linux_musl.rs | 3 +-- - .../rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs | 2 -- - 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 --- 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 { @@ -31,8 +16,6 @@ index 6ba5112342c..b66c2257f3e 100644 Target { 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 --- 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 { @@ -45,8 +28,6 @@ index 25ef767c4b1..a580890c8fb 100644 ..base::linux_musl::opts() }, } -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 --- 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 { @@ -59,8 +40,6 @@ index 76051403a55..21628c036dc 100644 ..base::linux_musl::opts() }, } -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 --- 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 { @@ -73,8 +52,6 @@ index 2daf2ab4d8f..2910cbcb9c1 100644 ..base::linux_musl::opts() }, } -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 --- 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 { @@ -87,8 +64,6 @@ index 9bf0b4fd7e4..b2f29501993 100644 ..base::linux_musl::opts() }, } -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 --- 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 { @@ -101,8 +76,6 @@ index 9b5fcd87b12..591e1850cd0 100644 ..base::linux_musl::opts() }, } -diff --git a/compiler/rustc_target/src/spec/targets/i586_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/i586_unknown_linux_musl.rs -index 42babb90da7..87628fcad4c 100644 --- a/compiler/rustc_target/src/spec/targets/i586_unknown_linux_musl.rs +++ b/compiler/rustc_target/src/spec/targets/i586_unknown_linux_musl.rs @@ -5,7 +5,5 @@ pub(crate) fn target() -> Target { @@ -113,8 +86,6 @@ index 42babb90da7..87628fcad4c 100644 - base.crt_static_default = true; 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 --- 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 { @@ -126,22 +97,17 @@ 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 --- 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 { - base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]); +@@ -9,7 +9,7 @@ pub(crate) fn target() -> Target { base.max_atomic_width = Some(64); base.stack_probes = StackProbeType::Inline; -- // FIXME(compiler-team#422): musl targets should be dynamically linked by default. + // 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.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 --- 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 +120,5 @@ index ee883532ad4..f65de3ec9bb 100644 Target { llvm_target: "x86_64-unknown-linux-musl".into(), -- -2.51.2 +2.52.0
