[gentoo-commits] proj/rust-patches:master commit in: /

["Matt Jolly" <kangie@gentoo.org>]

commit:     e56ec66a28926c8e2d0dcf18910e6835c28d064c
Author:     Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 29 04:58:26 2025 +0000
Commit:     Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Tue Jul 29 04:58:26 2025 +0000
URL:        https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=e56ec66a

Update musl dynamic linking patch for 9999 (1.90.0)

Signed-off-by: Matt Jolly <kangie <AT> gentoo.org>

 ...h => 1.90.0-compiler-musl-dynamic-linking.patch | 69 ++++++++++++++++++++--
 1 file changed, 63 insertions(+), 6 deletions(-)

diff --git a/1.89.0-compiler-musl-dynamic-linking.patch b/1.90.0-compiler-musl-dynamic-linking.patch
similarity index 66%
rename from 1.89.0-compiler-musl-dynamic-linking.patch
rename to 1.90.0-compiler-musl-dynamic-linking.patch
index 82c9f46..e84d9da 100644
--- a/1.89.0-compiler-musl-dynamic-linking.patch
+++ b/1.90.0-compiler-musl-dynamic-linking.patch
@@ -1,9 +1,32 @@
-From 77b152733e3c18fd40111292f1a9cc047f239e9d Mon Sep 17 00:00:00 2001
+From 5a3f8e8df100a2512e45d5ceeceb0b92d0545391 Mon Sep 17 00:00:00 2001
 From: Matt Jolly <kangie@gentoo.org>
-Date: Tue, 29 Jul 2025 13:09:48 +1000
-Subject: [PATCH 2/2] compiler: musl: dynamic linking by default
+Date: Tue, 29 Jul 2025 14:54:14 +1000
+Subject: [PATCH] compiler: musl: dynamic linking by default
 
 Signed-off-by: Matt Jolly <kangie@gentoo.org>
+---
+ .../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/mips64_unknown_linux_muslabi64.rs         | 3 +--
+ .../src/spec/targets/mips64el_unknown_linux_muslabi64.rs       | 2 --
+ .../src/spec/targets/powerpc64_unknown_linux_musl.rs           | 2 --
+ .../src/spec/targets/powerpc64le_unknown_linux_musl.rs         | 2 --
+ .../src/spec/targets/powerpc_unknown_linux_musl.rs             | 2 --
+ .../src/spec/targets/powerpc_unknown_linux_muslspe.rs          | 2 --
+ .../src/spec/targets/riscv32gc_unknown_linux_musl.rs           | 3 +--
+ .../rustc_target/src/spec/targets/s390x_unknown_linux_musl.rs  | 2 --
+ .../src/spec/targets/thumbv7neon_unknown_linux_musleabihf.rs   | 3 +--
+ .../rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs | 2 --
+ 18 files changed, 8 insertions(+), 37 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
 --- 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 {
@@ -16,6 +39,8 @@ Signed-off-by: Matt Jolly <kangie@gentoo.org>
      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 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 {
@@ -28,6 +53,8 @@ Signed-off-by: Matt Jolly <kangie@gentoo.org>
              ..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 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 {
@@ -40,6 +67,8 @@ Signed-off-by: Matt Jolly <kangie@gentoo.org>
              ..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 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 {
@@ -52,6 +81,8 @@ Signed-off-by: Matt Jolly <kangie@gentoo.org>
              ..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 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 {
@@ -64,6 +95,8 @@ Signed-off-by: Matt Jolly <kangie@gentoo.org>
              ..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 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 {
@@ -76,6 +109,8 @@ Signed-off-by: Matt Jolly <kangie@gentoo.org>
              ..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 {
@@ -86,6 +121,8 @@ Signed-off-by: Matt Jolly <kangie@gentoo.org>
 -    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 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
 @@ -11,8 +11,6 @@ pub(crate) fn target() -> Target {
@@ -97,6 +134,8 @@ Signed-off-by: Matt Jolly <kangie@gentoo.org>
  
      // 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/mips64_unknown_linux_muslabi64.rs b/compiler/rustc_target/src/spec/targets/mips64_unknown_linux_muslabi64.rs
+index f95ce756354..b85df7f3a29 100644
 --- a/compiler/rustc_target/src/spec/targets/mips64_unknown_linux_muslabi64.rs
 +++ b/compiler/rustc_target/src/spec/targets/mips64_unknown_linux_muslabi64.rs
 @@ -23,8 +23,7 @@ pub(crate) fn target() -> Target {
@@ -109,17 +148,21 @@ Signed-off-by: Matt Jolly <kangie@gentoo.org>
              llvm_abiname: "n64".into(),
              ..base
          },
+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 d42e097b0fd..38c3c7dfaa1 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,6 @@ pub(crate) fn target() -> Target {
      base.cpu = "mips64r2".into();
-     base.features = "+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;
      Target {
          // LLVM doesn't recognize "muslabi64" yet.
          llvm_target: "mips64el-unknown-linux-musl".into(),
+diff --git a/compiler/rustc_target/src/spec/targets/powerpc64_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/powerpc64_unknown_linux_musl.rs
+index 4dc76f0936c..482b6790dad 100644
 --- a/compiler/rustc_target/src/spec/targets/powerpc64_unknown_linux_musl.rs
 +++ b/compiler/rustc_target/src/spec/targets/powerpc64_unknown_linux_musl.rs
 @@ -10,8 +10,6 @@ pub(crate) fn target() -> Target {
@@ -128,9 +171,11 @@ Signed-off-by: Matt Jolly <kangie@gentoo.org>
      base.stack_probes = StackProbeType::Inline;
 -    // FIXME(compiler-team#422): musl targets should be dynamically linked by default.
 -    base.crt_static_default = true;
+     base.abi = "elfv2".into();
      base.llvm_abiname = "elfv2".into();
  
-     Target {
+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..1e0792115c8 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,6 @@ pub(crate) fn target() -> Target {
@@ -139,9 +184,11 @@ Signed-off-by: Matt Jolly <kangie@gentoo.org>
      base.stack_probes = StackProbeType::Inline;
 -    // FIXME(compiler-team#422): musl targets should be dynamically linked by default.
 -    base.crt_static_default = true;
+     base.abi = "elfv2".into();
      base.llvm_abiname = "elfv2".into();
  
-     Target {
+diff --git a/compiler/rustc_target/src/spec/targets/powerpc_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/powerpc_unknown_linux_musl.rs
+index 316b62d941b..f39142d0101 100644
 --- a/compiler/rustc_target/src/spec/targets/powerpc_unknown_linux_musl.rs
 +++ b/compiler/rustc_target/src/spec/targets/powerpc_unknown_linux_musl.rs
 @@ -9,8 +9,6 @@ pub(crate) fn target() -> Target {
@@ -153,6 +200,8 @@ Signed-off-by: Matt Jolly <kangie@gentoo.org>
  
      Target {
          llvm_target: "powerpc-unknown-linux-musl".into(),
+diff --git a/compiler/rustc_target/src/spec/targets/powerpc_unknown_linux_muslspe.rs b/compiler/rustc_target/src/spec/targets/powerpc_unknown_linux_muslspe.rs
+index 30d0d9cb60a..8ddb45483b3 100644
 --- a/compiler/rustc_target/src/spec/targets/powerpc_unknown_linux_muslspe.rs
 +++ b/compiler/rustc_target/src/spec/targets/powerpc_unknown_linux_muslspe.rs
 @@ -9,8 +9,6 @@ pub(crate) fn target() -> Target {
@@ -164,6 +213,8 @@ Signed-off-by: Matt Jolly <kangie@gentoo.org>
  
      Target {
          llvm_target: "powerpc-unknown-linux-muslspe".into(),
+diff --git a/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs
+index 938b39b10c6..43a937c1a39 100644
 --- a/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs
 +++ b/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs
 @@ -23,8 +23,7 @@ pub(crate) fn target() -> Target {
@@ -176,6 +227,8 @@ Signed-off-by: Matt Jolly <kangie@gentoo.org>
              ..base::linux_musl::opts()
          },
      }
+diff --git a/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_musl.rs
+index e9522ac760e..0cdbb626739 100644
 --- a/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_musl.rs
 +++ b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_musl.rs
 @@ -13,8 +13,6 @@ pub(crate) fn target() -> Target {
@@ -187,6 +240,8 @@ Signed-off-by: Matt Jolly <kangie@gentoo.org>
  
      Target {
          llvm_target: "s390x-unknown-linux-musl".into(),
+diff --git a/compiler/rustc_target/src/spec/targets/thumbv7neon_unknown_linux_musleabihf.rs b/compiler/rustc_target/src/spec/targets/thumbv7neon_unknown_linux_musleabihf.rs
+index 81c502bfead..fd1ebb430da 100644
 --- a/compiler/rustc_target/src/spec/targets/thumbv7neon_unknown_linux_musleabihf.rs
 +++ b/compiler/rustc_target/src/spec/targets/thumbv7neon_unknown_linux_musleabihf.rs
 @@ -27,8 +27,7 @@ pub(crate) fn target() -> Target {
@@ -199,6 +254,8 @@ Signed-off-by: Matt Jolly <kangie@gentoo.org>
              ..base::linux_musl::opts()
          },
      }
+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 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 {