.gitignore

@@ -1,2 +1,2 @@
-SOURCES/rustc-1.84.1-src.tar.xz
-SOURCES/wasi-libc-wasi-sdk-25.tar.gz
+SOURCES/rustc-1.92.0-src.tar.xz
+SOURCES/wasi-libc-wasi-sdk-27.tar.gz

.rust.metadata

@@ -1,2 +1,2 @@
-787899153e848b012d8bbd6ec0baf0ed5e189831 SOURCES/rustc-1.84.1-src.tar.xz
-c42dc30854ecbce5380304c38bd48b5911d1ce62 SOURCES/wasi-libc-wasi-sdk-25.tar.gz
+fbabcdb70a1ac1773e63d7800be42ffbaf9286e8 SOURCES/rustc-1.92.0-src.tar.xz
+7c12838ff50eb7d07e0679ae4e70b99ca5c711c0 SOURCES/wasi-libc-wasi-sdk-27.tar.gz

SOURCES/0001-Let-environment-variables-override-some-default-CPUs.patch

@@ -1,4 +1,4 @@
-From 5273432acfae75d6e509bbebcf8d28b0f3d820d0 Mon Sep 17 00:00:00 2001
+From e54c0a4cc8bd8a76b155714b23a61d1d32a8d069 Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
 Date: Fri, 9 Jun 2023 15:23:08 -0700
 Subject: [PATCH] Let environment variables override some default CPUs
@@ -10,10 +10,10 @@ Subject: [PATCH] Let environment variables override some default CPUs
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
-index 23913687a1fd..3253fbc84c74 100644
+index 9e406af53b5..9104903673f 100644
 --- a/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
 +++ b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
-@@ -2,7 +2,7 @@
+@@ -4,7 +4,7 @@
  
  pub(crate) fn target() -> Target {
      let mut base = base::linux_gnu::opts();
@@ -23,23 +23,23 @@ index 23913687a1fd..3253fbc84c74 100644
      base.max_atomic_width = Some(64);
      base.stack_probes = StackProbeType::Inline;
 diff --git a/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
-index a84a18a433ff..441af1018ff3 100644
+index cdcf7d62a3e..02f24274ed2 100644
 --- a/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
 +++ b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
-@@ -5,7 +5,7 @@ pub(crate) fn target() -> Target {
+@@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
      let mut base = base::linux_gnu::opts();
      base.endian = Endian::Big;
      // z10 is the oldest CPU supported by LLVM
 -    base.cpu = "z10".into();
 +    base.cpu = option_env!("RUSTC_TARGET_CPU_S390X").unwrap_or("z10").into();
      base.max_atomic_width = Some(128);
-     base.min_global_align = Some(16);
+     base.min_global_align = Some(Align::from_bits(16).unwrap());
      base.stack_probes = StackProbeType::Inline;
 diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
-index 59ec6c7f9d5f..b6f1be890b20 100644
+index 0c8353fad18..c2515e700bb 100644
 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
 +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
-@@ -2,7 +2,7 @@
+@@ -4,7 +4,7 @@
  
  pub(crate) fn target() -> Target {
      let mut base = base::linux_gnu::opts();
@@ -49,5 +49,5 @@ index 59ec6c7f9d5f..b6f1be890b20 100644
      base.max_atomic_width = Some(64);
      base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
 -- 
-2.47.1
+2.49.0
 

SOURCES/0001-Only-translate-profile-flags-for-Clang.patch

@@ -1,39 +0,0 @@
-From e4e678eb9cbd90acf2ba51e9ec0209b05c4403b5 Mon Sep 17 00:00:00 2001
-From: Josh Stone <cuviper@gmail.com>
-Date: Thu, 9 Jan 2025 16:47:10 -0800
-Subject: [PATCH] Only translate profile flags for Clang
-
----
- src/flags.rs | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/src/flags.rs b/src/flags.rs
-index 81834cf625f7..1a53c1b2345c 100644
---- a/src/flags.rs
-+++ b/src/flags.rs
-@@ -201,13 +201,15 @@ impl<'this> RustcCodegenFlags<'this> {
-                 if self.no_vectorize_slp {
-                     push_if_supported("-fno-slp-vectorize".into());
-                 }
--                // https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-fprofile-generate
--                if let Some(value) = self.profile_generate {
--                    push_if_supported(format!("-fprofile-generate={value}").into());
--                }
--                // https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-fprofile-use
--                if let Some(value) = self.profile_use {
--                    push_if_supported(format!("-fprofile-use={value}").into());
-+                if let ToolFamily::Clang { .. } = family {
-+                    // https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-fprofile-generate
-+                    if let Some(value) = self.profile_generate {
-+                        push_if_supported(format!("-fprofile-generate={value}").into());
-+                    }
-+                    // https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-fprofile-use
-+                    if let Some(value) = self.profile_use {
-+                        push_if_supported(format!("-fprofile-use={value}").into());
-+                    }
-                 }
-                 // https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-mguard
-                 if let Some(value) = self.control_flow_guard {
--- 
-2.47.1
-

SOURCES/0001-Use-lld-provided-by-system.patch

@@ -1,4 +1,4 @@
-From 3d8c6d095581e8d7585f3772cfd16f6367f3c008 Mon Sep 17 00:00:00 2001
+From e9405caf32dfb31bf17c3da0299df515a3755107 Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
 Date: Fri, 16 Aug 2024 10:12:58 -0700
 Subject: [PATCH] Use lld provided by system
@@ -12,12 +12,12 @@ Subject: [PATCH] Use lld provided by system
  5 files changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/compiler/rustc_target/src/spec/base/wasm.rs b/compiler/rustc_target/src/spec/base/wasm.rs
-index f237391016e7..08bcd9699b4a 100644
+index 7ede45766ea..b22362227bb 100644
 --- a/compiler/rustc_target/src/spec/base/wasm.rs
 +++ b/compiler/rustc_target/src/spec/base/wasm.rs
-@@ -85,8 +85,7 @@ macro_rules! args {
-         // arguments just yet
-         limit_rdylib_exports: false,
+@@ -81,8 +81,7 @@ macro_rules! args {
+         // threaded model which will legalize atomics to normal operations.
+         singlethread: true,
  
 -        // we use the LLD shipped with the Rust toolchain by default
 -        linker: Some("rust-lld".into()),
@@ -26,10 +26,10 @@ index f237391016e7..08bcd9699b4a 100644
  
          pre_link_args,
 diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
-index 222d5651b521..4b780bc8a8e7 100644
+index 35a4dd72b86..a9c8fc5edb8 100644
 --- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
 +++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
-@@ -14,7 +14,7 @@ pub fn target() -> Target {
+@@ -15,7 +15,7 @@ pub(crate) fn target() -> Target {
      let opts = TargetOptions {
          abi: "softfloat".into(),
          linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
@@ -39,10 +39,10 @@ index 222d5651b521..4b780bc8a8e7 100644
          relocation_model: RelocModel::Static,
          disable_redzone: true,
 diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
-index 429303170b6b..19d4ec53f6d8 100644
+index 327b52389b9..17313d7e8b3 100644
 --- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
 +++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
-@@ -9,6 +9,7 @@ pub fn target() -> Target {
+@@ -9,6 +9,7 @@ pub(crate) fn target() -> Target {
      base.max_atomic_width = Some(128);
      base.add_pre_link_args(LinkerFlavor::Msvc(Lld::No), &["/machine:arm64"]);
      base.features = "+v8a".into();
@@ -51,30 +51,30 @@ index 429303170b6b..19d4ec53f6d8 100644
      Target {
          llvm_target: "aarch64-unknown-windows".into(),
 diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
-index 549706998d46..b7e9158ddef5 100644
+index 1a6343595f5..8015b082cd1 100644
 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
 +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
-@@ -17,7 +17,7 @@ pub fn target() -> Target {
+@@ -19,7 +19,7 @@ pub(crate) fn target() -> Target {
          static_position_independent_executables: true,
          relro_level: RelroLevel::Full,
          linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
 -        linker: Some("rust-lld".into()),
 +        linker: Some("lld".into()),
+         rustc_abi: Some(RustcAbi::X86Softfloat),
          features: "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,+soft-float".into(),
          supported_sanitizers: SanitizerSet::KCFI | SanitizerSet::KERNELADDRESS,
-         disable_redzone: true,
 diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
-index 6da1fcca58c8..c84ae44576d4 100644
+index 0cf6a879462..3677fc662de 100644
 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
 +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
-@@ -16,6 +16,7 @@ pub fn target() -> Target {
+@@ -15,6 +15,7 @@ pub(crate) fn target() -> Target {
      base.plt_by_default = false;
      base.max_atomic_width = Some(64);
-     base.entry_abi = Conv::X86_64Win64;
+     base.entry_abi = CanonAbi::X86(X86Call::Win64);
 +    base.linker = Some("lld".into());
  
      // We disable MMX and SSE for now, even though UEFI allows using them. Problem is, you have to
      // enable these CPU features explicitly before their first use, otherwise their instructions
 -- 
-2.46.0
+2.51.0
 

SOURCES/0001-bootstrap-allow-disabling-target-self-contained.patch

@@ -1,36 +1,34 @@
-From 8d4d52446347872816ab51958e9f3162cf722ee6 Mon Sep 17 00:00:00 2001
+From 8364de4cb8edab85efcb895824ce06f4a95bd26f Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
-Date: Thu, 28 Sep 2023 18:14:28 -0700
-Subject: [PATCH 1/2] bootstrap: allow disabling target self-contained
+Date: Mon, 18 Aug 2025 17:11:07 -0700
+Subject: [PATCH] bootstrap: allow disabling target self-contained
 
 ---
- config.example.toml                           | 5 +++++
+ bootstrap.example.toml                        | 5 +++++
  src/bootstrap/src/core/build_steps/compile.rs | 4 ++++
- src/bootstrap/src/core/config/config.rs       | 8 ++++++++
+ src/bootstrap/src/core/config/config.rs       | 4 ++++
+ src/bootstrap/src/core/config/toml/target.rs  | 5 +++++
  src/bootstrap/src/lib.rs                      | 5 +++++
- 4 files changed, 22 insertions(+)
+ 5 files changed, 23 insertions(+)
 
-diff --git a/config.example.toml b/config.example.toml
-index d3233ad17b51..6a1f097c20cb 100644
---- a/config.example.toml
-+++ b/config.example.toml
-@@ -916,6 +916,11 @@
- # argument as the test binary.
- #runner = <none> (string)
- 
+diff --git a/bootstrap.example.toml b/bootstrap.example.toml
+index 6f37e51a47d..ee21bc06bea 100644
+--- a/bootstrap.example.toml
++++ b/bootstrap.example.toml
+@@ -1077,3 +1077,8 @@
+ # pass `off`:
+ # - x86_64-unknown-linux-gnu
+ #default-linker-linux-override = "off" (for most targets)
++
 +# Copy libc and CRT objects into the target lib/self-contained/ directory.
 +# Enabled by default on `musl`, `wasi`, and `windows-gnu` targets. Other
 +# targets may ignore this setting if they have nothing to be contained.
 +#self-contained = <platform-specific> (bool)
-+
- # =============================================================================
- # Distribution options
- #
 diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
-index 8e088682f92d..843b7123b120 100644
+index 6857a40ada8..9a98323a704 100644
 --- a/src/bootstrap/src/core/build_steps/compile.rs
 +++ b/src/bootstrap/src/core/build_steps/compile.rs
-@@ -346,6 +346,10 @@ fn copy_self_contained_objects(
+@@ -368,6 +368,10 @@ fn copy_self_contained_objects(
      compiler: &Compiler,
      target: TargetSelection,
  ) -> Vec<(PathBuf, DependencyType)> {
@@ -42,18 +40,48 @@ index 8e088682f92d..843b7123b120 100644
          builder.sysroot_target_libdir(*compiler, target).join("self-contained");
      t!(fs::create_dir_all(&libdir_self_contained));
 diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
-index e706aba977b6..a55d98e94dd8 100644
+index 4b7ae6df360..6bab269a33c 100644
 --- a/src/bootstrap/src/core/config/config.rs
 +++ b/src/bootstrap/src/core/config/config.rs
-@@ -627,6 +627,7 @@ pub struct Target {
-     pub runner: Option<String>,
-     pub no_std: bool,
-     pub codegen_backends: Option<Vec<String>>,
+@@ -864,6 +864,7 @@ pub(crate) fn parse_inner(
+                     runner: target_runner,
+                     optimized_compiler_builtins: target_optimized_compiler_builtins,
+                     jemalloc: target_jemalloc,
++                    self_contained: target_self_contained
+                 } = cfg;
+ 
+                 let mut target = Target::from_triple(&triple);
+@@ -921,6 +922,9 @@ pub(crate) fn parse_inner(
+                 if let Some(s) = target_no_std {
+                     target.no_std = s;
+                 }
++                if let Some(s) = target_self_contained {
++                    target.self_contained = s;
++                }
+                 target.cc = target_cc.map(PathBuf::from);
+                 target.cxx = target_cxx.map(PathBuf::from);
+                 target.ar = target_ar.map(PathBuf::from);
+diff --git a/src/bootstrap/src/core/config/toml/target.rs b/src/bootstrap/src/core/config/toml/target.rs
+index 4c7afa50b96..83b8a1b50ca 100644
+--- a/src/bootstrap/src/core/config/toml/target.rs
++++ b/src/bootstrap/src/core/config/toml/target.rs
+@@ -47,6 +47,7 @@ struct TomlTarget {
+         runner: Option<String> = "runner",
+         optimized_compiler_builtins: Option<CompilerBuiltins> = "optimized-compiler-builtins",
+         jemalloc: Option<bool> = "jemalloc",
++        self_contained: Option<bool> = "self-contained",
+     }
+ }
+ 
+@@ -80,6 +81,7 @@ pub struct Target {
+     pub codegen_backends: Option<Vec<CodegenBackendKind>>,
+     pub optimized_compiler_builtins: Option<CompilerBuiltins>,
+     pub jemalloc: Option<bool>,
 +    pub self_contained: bool,
  }
  
  impl Target {
-@@ -638,6 +639,9 @@ pub fn from_triple(triple: &str) -> Self {
+@@ -91,6 +93,9 @@ pub fn from_triple(triple: &str) -> Self {
          if triple.contains("emscripten") {
              target.runner = Some("node".into());
          }
@@ -63,29 +91,11 @@ index e706aba977b6..a55d98e94dd8 100644
          target
      }
  }
-@@ -1213,6 +1217,7 @@ struct TomlTarget {
-         no_std: Option<bool> = "no-std",
-         codegen_backends: Option<Vec<String>> = "codegen-backends",
-         runner: Option<String> = "runner",
-+        self_contained: Option<bool> = "self-contained",
-     }
- }
- 
-@@ -2038,6 +2043,9 @@ fn get_table(option: &str) -> Result<TomlConfig, toml::de::Error> {
-                 if let Some(s) = cfg.no_std {
-                     target.no_std = s;
-                 }
-+                if let Some(s) = cfg.self_contained {
-+                    target.self_contained = s;
-+                }
-                 target.cc = cfg.cc.map(PathBuf::from);
-                 target.cxx = cfg.cxx.map(PathBuf::from);
-                 target.ar = cfg.ar.map(PathBuf::from);
 diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
-index c384fd6bf435..a101c010b740 100644
+index dd30f05b728..cc89a84071e 100644
 --- a/src/bootstrap/src/lib.rs
 +++ b/src/bootstrap/src/lib.rs
-@@ -1351,6 +1351,11 @@ fn no_std(&self, target: TargetSelection) -> Option<bool> {
+@@ -1441,6 +1441,11 @@ fn no_std(&self, target: TargetSelection) -> Option<bool> {
          self.config.target_config.get(&target).map(|t| t.no_std)
      }
  
@@ -98,5 +108,5 @@ index c384fd6bf435..a101c010b740 100644
      /// and `remote-test-server` binaries.
      fn remote_tested(&self, target: TargetSelection) -> bool {
 -- 
-2.47.1
+2.51.0
 

SOURCES/0001-only-copy-rustlib-into-stage0-sysroot.patch

@@ -0,0 +1,28 @@
+From 7d83bae4e2577ffa2afaf2fddb6948c1756a403c Mon Sep 17 00:00:00 2001
+From: Paul Murphy <paumurph@redhat.com>
+Date: Thu, 10 Jul 2025 09:06:22 -0500
+Subject: [PATCH] only copy rustlib into stage0 sysroot
+
+Otherwise, much more is copied, and doing so likely runs into
+permissions errors if the bootstrap toolchain lives in the host's
+sysroot.
+---
+ src/bootstrap/src/core/build_steps/compile.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
+index 4d0ae54e1ef..4ef70dd9b97 100644
+--- a/src/bootstrap/src/core/build_steps/compile.rs
++++ b/src/bootstrap/src/core/build_steps/compile.rs
+@@ -811,7 +811,7 @@ fn run(self, builder: &Builder<'_>) {
+                 let _ = fs::remove_dir_all(sysroot.join("lib/rustlib/src/rust"));
+             }
+ 
+-            builder.cp_link_r(&builder.initial_sysroot.join("lib"), &sysroot.join("lib"));
++            builder.cp_link_r(&builder.initial_sysroot.join("lib/rustlib"), &sysroot.join("lib/rustlib"));
+         } else {
+             if builder.download_rustc() {
+                 // Ensure there are no CI-rustc std artifacts.
+-- 
+2.49.0
+

SOURCES/0002-set-an-external-library-path-for-wasm32-wasi.patch

@@ -1,19 +1,20 @@
-From 21d53eca2af5f04c0aa6b898f99f58e0e093cfdd Mon Sep 17 00:00:00 2001
+From 862d09fe2e8b0f5ce8fe7bfc592cda66a1d74c08 Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
-Date: Thu, 28 Sep 2023 18:18:16 -0700
+Date: Mon, 18 Aug 2025 17:13:28 -0700
 Subject: [PATCH 2/2] set an external library path for wasm32-wasi
 
 ---
  compiler/rustc_codegen_ssa/src/back/link.rs            | 10 ++++++++++
- compiler/rustc_target/src/spec/mod.rs                  |  4 ++++
+ compiler/rustc_target/src/spec/json.rs                 |  4 ++++
+ compiler/rustc_target/src/spec/mod.rs                  |  2 ++
  .../rustc_target/src/spec/targets/wasm32_wasip1.rs     |  7 ++++---
- 3 files changed, 18 insertions(+), 3 deletions(-)
+ 4 files changed, 20 insertions(+), 3 deletions(-)
 
 diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
-index 5149e3a12f23..cf62fbdc7f59 100644
+index 48b01ea2df19..59b87396fed2 100644
 --- a/compiler/rustc_codegen_ssa/src/back/link.rs
 +++ b/compiler/rustc_codegen_ssa/src/back/link.rs
-@@ -1663,6 +1663,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat
+@@ -1559,6 +1559,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat
              return file_path;
          }
      }
@@ -26,10 +27,10 @@ index 5149e3a12f23..cf62fbdc7f59 100644
      for search_path in sess.target_filesearch().search_paths(PathKind::Native) {
          let file_path = search_path.dir.join(name);
          if file_path.exists() {
-@@ -2163,6 +2169,10 @@ fn add_library_search_dirs(
-             ControlFlow::<()>::Continue(())
-         },
-     );
+@@ -2140,6 +2146,10 @@ fn add_library_search_dirs(
+         }
+         ControlFlow::<()>::Continue(())
+     });
 +
 +    if let Some(lib_path) = &sess.target.options.external_lib_path {
 +        cmd.include_path(Path::new(lib_path.as_ref()));
@@ -37,35 +38,19 @@ index 5149e3a12f23..cf62fbdc7f59 100644
  }
  
  /// Add options making relocation sections in the produced ELF files read-only
-diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
-index 321ab40403a3..54791c8892d8 100644
---- a/compiler/rustc_target/src/spec/mod.rs
-+++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -2155,6 +2155,7 @@ pub struct TargetOptions {
-     /// Objects to link before and after all other object code.
-     pub pre_link_objects: CrtObjects,
-     pub post_link_objects: CrtObjects,
-+    pub external_lib_path: Option<StaticCow<str>>,
-     /// Same as `(pre|post)_link_objects`, but when self-contained linking mode is enabled.
-     pub pre_link_objects_self_contained: CrtObjects,
-     pub post_link_objects_self_contained: CrtObjects,
-@@ -2651,6 +2652,7 @@ fn default() -> TargetOptions {
-             relro_level: RelroLevel::None,
-             pre_link_objects: Default::default(),
-             post_link_objects: Default::default(),
-+            external_lib_path: None,
-             pre_link_objects_self_contained: Default::default(),
-             post_link_objects_self_contained: Default::default(),
-             link_self_contained: LinkSelfContainedDefault::False,
-@@ -3355,6 +3357,7 @@ macro_rules! key {
-         key!(linker_is_gnu_json = "linker-is-gnu", bool);
-         key!(pre_link_objects = "pre-link-objects", link_objects);
-         key!(post_link_objects = "post-link-objects", link_objects);
-+        key!(external_lib_path, optional);
-         key!(pre_link_objects_self_contained = "pre-link-objects-fallback", link_objects);
-         key!(post_link_objects_self_contained = "post-link-objects-fallback", link_objects);
-         // Deserializes the backwards-compatible variants of `-Clink-self-contained`
-@@ -3636,6 +3639,7 @@ macro_rules! target_option_val {
+diff --git a/compiler/rustc_target/src/spec/json.rs b/compiler/rustc_target/src/spec/json.rs
+index f236be92b3b6..eea6e0c203d2 100644
+--- a/compiler/rustc_target/src/spec/json.rs
++++ b/compiler/rustc_target/src/spec/json.rs
+@@ -81,6 +81,7 @@ macro_rules! forward_opt {
+         forward!(linker_is_gnu_json);
+         forward!(pre_link_objects);
+         forward!(post_link_objects);
++        forward_opt!(external_lib_path);
+         forward!(pre_link_objects_self_contained);
+         forward!(post_link_objects_self_contained);
+ 
+@@ -301,6 +302,7 @@ macro_rules! target_option_val {
          target_option_val!(linker_is_gnu_json, "linker-is-gnu");
          target_option_val!(pre_link_objects);
          target_option_val!(post_link_objects);
@@ -73,11 +58,40 @@ index 321ab40403a3..54791c8892d8 100644
          target_option_val!(pre_link_objects_self_contained, "pre-link-objects-fallback");
          target_option_val!(post_link_objects_self_contained, "post-link-objects-fallback");
          target_option_val!(link_args - pre_link_args_json, "pre-link-args");
+@@ -511,6 +513,8 @@ struct TargetSpecJson {
+     pre_link_objects: Option<CrtObjects>,
+     #[serde(rename = "post-link-objects")]
+     post_link_objects: Option<CrtObjects>,
++    #[serde(rename = "external-lib-path")]
++    external_lib_path: Option<StaticCow<str>>,
+     #[serde(rename = "pre-link-objects-fallback")]
+     pre_link_objects_self_contained: Option<CrtObjects>,
+     #[serde(rename = "post-link-objects-fallback")]
+diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
+index 07fb1ce63f7c..c076c2836f84 100644
+--- a/compiler/rustc_target/src/spec/mod.rs
++++ b/compiler/rustc_target/src/spec/mod.rs
+@@ -1992,6 +1992,7 @@ pub struct TargetOptions {
+     /// Objects to link before and after all other object code.
+     pub pre_link_objects: CrtObjects,
+     pub post_link_objects: CrtObjects,
++    pub external_lib_path: Option<StaticCow<str>>,
+     /// Same as `(pre|post)_link_objects`, but when self-contained linking mode is enabled.
+     pub pre_link_objects_self_contained: CrtObjects,
+     pub post_link_objects_self_contained: CrtObjects,
+@@ -2518,6 +2519,7 @@ fn default() -> TargetOptions {
+             relro_level: RelroLevel::None,
+             pre_link_objects: Default::default(),
+             post_link_objects: Default::default(),
++            external_lib_path: None,
+             pre_link_objects_self_contained: Default::default(),
+             post_link_objects_self_contained: Default::default(),
+             link_self_contained: LinkSelfContainedDefault::False,
 diff --git a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
-index 1cd30f21bec1..9a752d5712a6 100644
+index 26add451ed25..3eaf050e6823 100644
 --- a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
 +++ b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
-@@ -19,11 +19,12 @@ pub(crate) fn target() -> Target {
+@@ -21,11 +21,12 @@ pub(crate) fn target() -> Target {
      options.env = "p1".into();
      options.add_pre_link_args(LinkerFlavor::WasmLld(Cc::Yes), &["--target=wasm32-wasip1"]);
  
@@ -94,5 +108,5 @@ index 1cd30f21bec1..9a752d5712a6 100644
      // Right now this is a bit of a workaround but we're currently saying that
      // the target by default has a static crt which we're taking as a signal
 -- 
-2.47.1
+2.51.0
 

SOURCES/macros.rust-toolset

@@ -29,6 +29,12 @@
 # -Copt-level: set optimization level (default: highest optimization level)
 # -Cdebuginfo: set debuginfo verbosity (default: full debug information)
 # -Ccodegen-units: set number of parallel code generation units (default: 1)
+# -Cforce-frame-pointers: force inclusion of frame pointers (default: enabled
+#       on x86_64 and aarch64 on Fedora 37+)
+#
+# Additionally, some linker flags are set which correspond to the default
+# Fedora compiler flags for hardening and for embedding package versions into
+# compiled binaries.
 #
 # ref. https://doc.rust-lang.org/rustc/codegen-options/index.html
 %build_rustflags %{shrink:
@@ -36,6 +42,8 @@
   -Cdebuginfo=%rustflags_debuginfo
   -Ccodegen-units=%rustflags_codegen_units
   -Cstrip=none
+  %{expr:0%{?_include_frame_pointers} && ("%{_arch}" != "ppc64le" && "%{_arch}" != "s390x" && "%{_arch}" != "i386") ? "-Cforce-frame-pointers=yes" : ""}
+  %[0%{?_package_note_status} ? "-Clink-arg=%_package_note_flags" : ""]
 }
 
 # __cargo: cargo command with environment variables
@@ -118,32 +126,31 @@ EOF}\
     %{nil}                                                      \
 }
 
-# NB: cargo_build/test/install do not use the -n/-a/-f argument parsing like
-# Fedora's rust-packaging, because that change would break anyone that's
-# already passing arguments directly to cargo after the macro. Instead, one can
-# explicitly use --no-default-features, --all-features, or --features XYZ.
-
-# cargo_build: builds the crate with cargo
-%cargo_build\
+# cargo_build: builds the crate with cargo with the specified feature flags
+%cargo_build(naf:)\
 %{shrink:                                               \
     %{__cargo} build                                    \
     %{__cargo_common_opts}                              \
     --profile rpm                                       \
+    %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}    \
+    %*                                                  \
 }
 
-# cargo_test: runs the test suite with cargo
+# cargo_test: runs the test suite with cargo with the specified feature flags
 #
 # To pass command-line arguments to the cargo test runners directly (for
-# example, to skip certain tests during package builds), the
-# "cargo test" argument parsing need to be bypassed,
-# i.e. "%%cargo_test -- --skip foo" for skipping all tests with names that
+# example, to skip certain tests during package builds), both the cargo_test
+# macro argument parsing and "cargo test" argument parsing need to be bypassed,
+# i.e. "%%cargo_test -- -- --skip foo" for skipping all tests with names that
 # match "foo".
-%cargo_test\
+%cargo_test(naf:)\
 %{shrink:                                               \
     %{__cargo} test                                     \
     %{__cargo_common_opts}                              \
     --profile rpm                                       \
     --no-fail-fast                                      \
+    %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}    \
+    %*                                                  \
 }
 
 # cargo_install: install files into the buildroot
@@ -153,14 +160,19 @@ EOF}\
 # "$CARGO_HOME/.crates.toml" file, which is used to keep track of which version
 # of a specific binary has been installed, but which conflicts between builds
 # of different Rust applications and is not needed when building RPM packages.
-%cargo_install\
-%{shrink:                                                         \
-  %{__cargo} install                                              \
-    %{__cargo_common_opts}                                        \
-    --profile rpm                                                 \
-    --no-track                                                    \
-    --path .                                                      \
-}
+%cargo_install(t:naf:)\
+(\
+set -euo pipefail                                                   \
+  %{shrink:                                                         \
+    %{__cargo} install                                              \
+      %{__cargo_common_opts}                                        \
+      --profile rpm                                                 \
+      --no-track                                                    \
+      --path .                                                      \
+      %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}              \
+      %*                                                            \
+  }                                                                 \
+)
 
 # cargo_license: print license information for all crate dependencies
 #

SOURCES/rustc-1.84.0-disable-libssh2.patch

@@ -1,44 +0,0 @@
-diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock
---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2024-12-12 14:07:10.755481543 -0800
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2024-12-12 14:07:10.756481534 -0800
-@@ -2272,7 +2272,6 @@ checksum = "10472326a8a6477c3c20a64547b0
- dependencies = [
-  "cc",
-  "libc",
-- "libssh2-sys",
-  "libz-sys",
-  "openssl-sys",
-  "pkg-config",
-@@ -2313,20 +2312,6 @@ dependencies = [
-  "pkg-config",
-  "vcpkg",
- ]
--
--[[package]]
--name = "libssh2-sys"
--version = "0.3.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
--dependencies = [
-- "cc",
-- "libc",
-- "libz-sys",
-- "openssl-sys",
-- "pkg-config",
-- "vcpkg",
--]
- 
- [[package]]
- name = "libz-sys"
-diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2024-12-12 14:07:10.756481534 -0800
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2024-12-12 14:07:56.866087428 -0800
-@@ -47,7 +47,7 @@ curl = "0.4.46"
- curl-sys = "0.4.73"
- filetime = "0.2.23"
- flate2 = { version = "1.0.30", default-features = false, features = ["zlib"] }
--git2 = "0.19.0"
-+git2 = { version = "0.19.0", default-features = false, features = ["https"] }
- git2-curl = "0.20.0"
- gix = { version = "0.67.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] }
- glob = "0.3.1"

SOURCES/rustc-1.84.0-unbundle-sqlite.patch

@@ -1,23 +0,0 @@
-diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock
---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2024-12-07 06:47:38.000000000 -0800
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2024-12-12 14:02:54.412672539 -0800
-@@ -2310,7 +2310,6 @@ version = "0.30.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149"
- dependencies = [
-- "cc",
-  "pkg-config",
-  "vcpkg",
- ]
-diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2024-12-12 14:02:54.412672539 -0800
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2024-12-12 14:03:25.665405417 -0800
-@@ -80,7 +80,7 @@ proptest = "1.5.0"
- pulldown-cmark = { version = "0.12.0", default-features = false, features = ["html"] }
- rand = "0.8.5"
- regex = "1.10.5"
--rusqlite = { version = "0.32.0", features = ["bundled"] }
-+rusqlite = { version = "0.32.0", features = [] }
- rustc-hash = "2.0.0"
- rustfix = { version = "0.9.0", path = "crates/rustfix" }
- same-file = "1.0.6"

SOURCES/rustc-1.92.0-disable-libssh2.patch

@@ -0,0 +1,44 @@
+diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock
+--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2025-08-16 15:47:14.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2025-08-18 17:31:39.554771554 -0700
+@@ -2800,7 +2800,6 @@ checksum = "1c42fe03df2bd3c53a3a9c7317ad
+ dependencies = [
+  "cc",
+  "libc",
+- "libssh2-sys",
+  "libz-sys",
+  "openssl-sys",
+  "pkg-config",
+@@ -2847,20 +2846,6 @@ dependencies = [
+  "pkg-config",
+  "vcpkg",
+ ]
+-
+-[[package]]
+-name = "libssh2-sys"
+-version = "0.3.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "220e4f05ad4a218192533b300327f5150e809b54c4ec83b5a1d91833601811b9"
+-dependencies = [
+- "cc",
+- "libc",
+- "libz-sys",
+- "openssl-sys",
+- "pkg-config",
+- "vcpkg",
+-]
+ 
+ [[package]]
+ name = "libz-rs-sys"
+diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2025-08-16 15:47:14.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2025-08-18 17:33:02.401743230 -0700
+@@ -46,7 +46,7 @@ curl = "0.4.48"
+ curl-sys = "0.4.83"
+ filetime = "0.2.26"
+ flate2 = { version = "1.1.2", default-features = false, features = ["zlib-rs"] }
+-git2 = "0.20.2"
++git2 = { version = "0.20.2", default-features = false, features = ["https"] }
+ git2-curl = "0.21.0"
+ # When updating this, also see if `gix-transport` further down needs updating or some auth-related tests will fail.
+ gix = { version = "0.73.0", default-features = false, features = ["progress-tree", "parallel", "dirwalk", "status"] }

SOURCES/rustc-1.92.0-unbundle-sqlite.patch

@@ -0,0 +1,23 @@
+diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock
+--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2025-11-07 13:31:19.003737886 +0100
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2025-11-07 13:14:41.637982893 +0100
+@@ -2835,7 +2835,6 @@ version = "0.35.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "133c182a6a2c87864fe97778797e46c7e999672690dc9fa3ee8e241aa4a9c13f"
+ dependencies = [
+- "cc",
+  "pkg-config",
+  "vcpkg",
+ ]
+diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2025-11-07 13:31:28.338643618 +0100
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2025-11-07 13:15:00.266505214 +0100
+@@ -81,7 +81,7 @@ proptest = "1.8.0"
+ pulldown-cmark = { version = "0.13.0", default-features = false, features = ["html"] }
+ rand = "0.9.2"
+ regex = "1.11.3"
+-rusqlite = { version = "0.37.0", features = ["bundled"] }
++rusqlite = { version = "0.37.0", features = [] }
+ rustc-hash = "2.1.1"
+ rustc-stable-hash = "0.1.2"
+ rustfix = { version = "0.9.2", path = "crates/rustfix" }