.gitignore

@@ -1,2 +1,17 @@
-SOURCES/rustc-1.92.0-src.tar.xz
+SOURCES/rustc-1.88.0-src.tar.xz
-SOURCES/wasi-libc-wasi-sdk-27.tar.gz
+SOURCES/wasi-libc-640c0cfc19a96b099e0791824be5ef0105ce2084.tar.gz
+SOURCES/cargo-1.87.0-aarch64-unknown-linux-gnu.tar.xz
+SOURCES/cargo-1.87.0-i686-unknown-linux-gnu.tar.xz
+SOURCES/cargo-1.87.0-powerpc64le-unknown-linux-gnu.tar.xz
+SOURCES/cargo-1.87.0-s390x-unknown-linux-gnu.tar.xz
+SOURCES/cargo-1.87.0-x86_64-unknown-linux-gnu.tar.xz
+SOURCES/rust-std-1.87.0-aarch64-unknown-linux-gnu.tar.xz
+SOURCES/rust-std-1.87.0-i686-unknown-linux-gnu.tar.xz
+SOURCES/rust-std-1.87.0-powerpc64le-unknown-linux-gnu.tar.xz
+SOURCES/rust-std-1.87.0-s390x-unknown-linux-gnu.tar.xz
+SOURCES/rust-std-1.87.0-x86_64-unknown-linux-gnu.tar.xz
+SOURCES/rustc-1.87.0-aarch64-unknown-linux-gnu.tar.xz
+SOURCES/rustc-1.87.0-i686-unknown-linux-gnu.tar.xz
+SOURCES/rustc-1.87.0-powerpc64le-unknown-linux-gnu.tar.xz
+SOURCES/rustc-1.87.0-s390x-unknown-linux-gnu.tar.xz
+SOURCES/rustc-1.87.0-x86_64-unknown-linux-gnu.tar.xz

.rust.metadata

@@ -1,2 +1,17 @@
-fbabcdb70a1ac1773e63d7800be42ffbaf9286e8 SOURCES/rustc-1.92.0-src.tar.xz
+a5772a6462f53ffc71fda030bece8442d1214198 SOURCES/rustc-1.88.0-src.tar.xz
-7c12838ff50eb7d07e0679ae4e70b99ca5c711c0 SOURCES/wasi-libc-wasi-sdk-27.tar.gz
+d6330f7ed84d311d1338796af7fd60f011f3a707 SOURCES/wasi-libc-640c0cfc19a96b099e0791824be5ef0105ce2084.tar.gz
+9db2221e1661966bb075c661452db71f27b42c41 SOURCES/cargo-1.87.0-aarch64-unknown-linux-gnu.tar.xz
+8a14006ae0e34336304190e8d9411b1061a66da4 SOURCES/cargo-1.87.0-i686-unknown-linux-gnu.tar.xz
+be2b004db6f63991a61ef0c7cea9c8c5b97b10cd SOURCES/cargo-1.87.0-powerpc64le-unknown-linux-gnu.tar.xz
+1ba5567a3aa425b2391682d93917e697076e2081 SOURCES/cargo-1.87.0-s390x-unknown-linux-gnu.tar.xz
+eacf8a939ae7a59670e885e23b6e7fe051bf01b5 SOURCES/cargo-1.87.0-x86_64-unknown-linux-gnu.tar.xz
+e6cb528be346a3b0ee89cb6dc9d1cf926fa3307e SOURCES/rust-std-1.87.0-aarch64-unknown-linux-gnu.tar.xz
+9d34e6af2192af000a2c1c7ea8bb7fbb2cd6bff1 SOURCES/rust-std-1.87.0-i686-unknown-linux-gnu.tar.xz
+3beab8917d485941349f3142cc0a539fd89ea81a SOURCES/rust-std-1.87.0-powerpc64le-unknown-linux-gnu.tar.xz
+d9e6aecdc9ea4bd767b9b4e08b8dddb7188522ab SOURCES/rust-std-1.87.0-s390x-unknown-linux-gnu.tar.xz
+30391afc6455cdba697c8d29926a0c83788134c5 SOURCES/rust-std-1.87.0-x86_64-unknown-linux-gnu.tar.xz
+65b8fd98bf0881e066de71dfcf1da45ac5d20864 SOURCES/rustc-1.87.0-aarch64-unknown-linux-gnu.tar.xz
+b73832be27ac612d0ffb334c4e30e3bba949a563 SOURCES/rustc-1.87.0-i686-unknown-linux-gnu.tar.xz
+a64b055a86cf4f853dc589d9ace7ab001ab239e5 SOURCES/rustc-1.87.0-powerpc64le-unknown-linux-gnu.tar.xz
+2246258130c9a6028fe88c73217b4be50f7236cd SOURCES/rustc-1.87.0-s390x-unknown-linux-gnu.tar.xz
+7b35341d333ad5bd2f0b93ad9e8b68b1f137a347 SOURCES/rustc-1.87.0-x86_64-unknown-linux-gnu.tar.xz

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

@@ -1,4 +1,4 @@
-From e54c0a4cc8bd8a76b155714b23a61d1d32a8d069 Mon Sep 17 00:00:00 2001
+From 5273432acfae75d6e509bbebcf8d28b0f3d820d0 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 9e406af53b5..9104903673f 100644
+index 23913687a1fd..3253fbc84c74 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
-@@ -4,7 +4,7 @@
+@@ -2,7 +2,7 @@
  
  pub(crate) fn target() -> Target {
      let mut base = base::linux_gnu::opts();
@@ -23,23 +23,23 @@ index 9e406af53b5..9104903673f 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 cdcf7d62a3e..02f24274ed2 100644
+index a84a18a433ff..441af1018ff3 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
-@@ -6,7 +6,7 @@ pub(crate) fn target() -> Target {
+@@ -5,7 +5,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(Align::from_bits(16).unwrap());
+     base.min_global_align = Some(16);
      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 0c8353fad18..c2515e700bb 100644
+index 59ec6c7f9d5f..b6f1be890b20 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
-@@ -4,7 +4,7 @@
+@@ -2,7 +2,7 @@
  
  pub(crate) fn target() -> Target {
      let mut base = base::linux_gnu::opts();
@@ -49,5 +49,5 @@ index 0c8353fad18..c2515e700bb 100644
      base.max_atomic_width = Some(64);
      base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
 -- 
-2.49.0
+2.47.1
 

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

@@ -1,4 +1,4 @@
-From e9405caf32dfb31bf17c3da0299df515a3755107 Mon Sep 17 00:00:00 2001
+From 687112c89c9058ef1e79f1c3a974940b1ae43ea3 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 7ede45766ea..b22362227bb 100644
+index 81b96cd39ffa..4c9916af826b 100644
 --- a/compiler/rustc_target/src/spec/base/wasm.rs
 +++ b/compiler/rustc_target/src/spec/base/wasm.rs
-@@ -81,8 +81,7 @@ macro_rules! args {
+@@ -85,8 +85,7 @@ macro_rules! args {
-         // threaded model which will legalize atomics to normal operations.
+         // arguments just yet
-         singlethread: true,
+         limit_rdylib_exports: false,
  
 -        // we use the LLD shipped with the Rust toolchain by default
 -        linker: Some("rust-lld".into()),
@@ -26,7 +26,7 @@ index 7ede45766ea..b22362227bb 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 35a4dd72b86..a9c8fc5edb8 100644
+index 3b719ebaf07e..8b4fecee68f0 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
 @@ -15,7 +15,7 @@ pub(crate) fn target() -> Target {
@@ -39,7 +39,7 @@ index 35a4dd72b86..a9c8fc5edb8 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 327b52389b9..17313d7e8b3 100644
+index 9656024ddaa1..2099fa17229f 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(crate) fn target() -> Target {
@@ -51,7 +51,7 @@ index 327b52389b9..17313d7e8b3 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 1a6343595f5..8015b082cd1 100644
+index e14a36735894..b493d7d98b46 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
 @@ -19,7 +19,7 @@ pub(crate) fn target() -> Target {
@@ -64,17 +64,17 @@ index 1a6343595f5..8015b082cd1 100644
          features: "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,+soft-float".into(),
          supported_sanitizers: SanitizerSet::KCFI | SanitizerSet::KERNELADDRESS,
 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 0cf6a879462..3677fc662de 100644
+index bce6aa0ebc6b..7fa1148a1de7 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
-@@ -15,6 +15,7 @@ pub(crate) fn target() -> Target {
+@@ -14,6 +14,7 @@ pub(crate) fn target() -> Target {
      base.plt_by_default = false;
      base.max_atomic_width = Some(64);
-     base.entry_abi = CanonAbi::X86(X86Call::Win64);
+     base.entry_abi = Conv::X86_64Win64;
 +    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.51.0
+2.48.1
 

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

@@ -1,34 +1,36 @@
-From 8364de4cb8edab85efcb895824ce06f4a95bd26f Mon Sep 17 00:00:00 2001
+From e8833a9032b9f5773ef891b3f12b93322d6b4950 Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
+From: Jesus Checa Hidalgo <jchecahi@redhat.com>
-Date: Mon, 18 Aug 2025 17:11:07 -0700
+Date: Mon, 7 Apr 2025 16:59:10 +0200
-Subject: [PATCH] bootstrap: allow disabling target self-contained
+Subject: [PATCH 1/2] bootstrap: allow disabling target self-contained
 
 ---
  bootstrap.example.toml                        | 5 +++++
  src/bootstrap/src/core/build_steps/compile.rs | 4 ++++
- src/bootstrap/src/core/config/config.rs       | 4 ++++
+ src/bootstrap/src/core/config/config.rs       | 8 ++++++++
- src/bootstrap/src/core/config/toml/target.rs  | 5 +++++
  src/bootstrap/src/lib.rs                      | 5 +++++
- 5 files changed, 23 insertions(+)
+ 4 files changed, 22 insertions(+)
 
 diff --git a/bootstrap.example.toml b/bootstrap.example.toml
-index 6f37e51a47d..ee21bc06bea 100644
+index 2a98821f225..580d6b2a8a2 100644
 --- a/bootstrap.example.toml
 +++ b/bootstrap.example.toml
-@@ -1077,3 +1077,8 @@
+@@ -948,6 +948,11 @@
- # pass `off`:
+ # This overrides the global `rust.jemalloc` option. See that option for more info.
- # - x86_64-unknown-linux-gnu
+ #jemalloc = rust.jemalloc (bool)
- #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 6857a40ada8..9a98323a704 100644
+index 18b5d4426b1..3de9667123b 100644
 --- a/src/bootstrap/src/core/build_steps/compile.rs
 +++ b/src/bootstrap/src/core/build_steps/compile.rs
-@@ -368,6 +368,10 @@ fn copy_self_contained_objects(
+@@ -370,6 +370,10 @@ fn copy_self_contained_objects(
      compiler: &Compiler,
      target: TargetSelection,
  ) -> Vec<(PathBuf, DependencyType)> {
@@ -40,48 +42,18 @@ index 6857a40ada8..9a98323a704 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 4b7ae6df360..6bab269a33c 100644
+index bbb0fbfbb93..8642a86cbf8 100644
 --- a/src/bootstrap/src/core/config/config.rs
 +++ b/src/bootstrap/src/core/config/config.rs
-@@ -864,6 +864,7 @@ pub(crate) fn parse_inner(
+@@ -666,6 +666,7 @@ pub struct Target {
-                     runner: target_runner,
+     pub codegen_backends: Option<Vec<String>>,
-                     optimized_compiler_builtins: target_optimized_compiler_builtins,
+     pub optimized_compiler_builtins: Option<bool>,
-                     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 {
-@@ -91,6 +93,9 @@ pub fn from_triple(triple: &str) -> Self {
+@@ -677,6 +678,9 @@ pub fn from_triple(triple: &str) -> Self {
          if triple.contains("emscripten") {
              target.runner = Some("node".into());
          }
@@ -91,11 +63,29 @@ index 4c7afa50b96..83b8a1b50ca 100644
          target
      }
  }
+@@ -1292,6 +1296,7 @@ struct TomlTarget {
+         runner: Option<String> = "runner",
+         optimized_compiler_builtins: Option<bool> = "optimized-compiler-builtins",
+         jemalloc: Option<bool> = "jemalloc",
++        self_contained: Option<bool> = "self-contained",
+     }
+ }
+ 
+@@ -2245,6 +2250,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 dd30f05b728..cc89a84071e 100644
+index 843d474f92d..3a4398ee1f8 100644
 --- a/src/bootstrap/src/lib.rs
 +++ b/src/bootstrap/src/lib.rs
-@@ -1441,6 +1441,11 @@ fn no_std(&self, target: TargetSelection) -> Option<bool> {
+@@ -1434,6 +1434,11 @@ fn no_std(&self, target: TargetSelection) -> Option<bool> {
          self.config.target_config.get(&target).map(|t| t.no_std)
      }
  
@@ -108,5 +98,5 @@ index dd30f05b728..cc89a84071e 100644
      /// and `remote-test-server` binaries.
      fn remote_tested(&self, target: TargetSelection) -> bool {
 -- 
-2.51.0
+2.48.1
 

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

@@ -1,28 +0,0 @@
-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,20 +1,20 @@
-From 862d09fe2e8b0f5ce8fe7bfc592cda66a1d74c08 Mon Sep 17 00:00:00 2001
+From 35a37bd892939b8a1cd194632de3b9dd3a3d479b Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
+From: Jesus Checa Hidalgo <jchecahi@redhat.com>
-Date: Mon, 18 Aug 2025 17:13:28 -0700
+Date: Mon, 7 Apr 2025 17:22:56 +0200
 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/json.rs                 |  4 ++++
+ compiler/rustc_target/src/spec/json.rs                 |  2 ++
  compiler/rustc_target/src/spec/mod.rs                  |  2 ++
  .../rustc_target/src/spec/targets/wasm32_wasip1.rs     |  7 ++++---
- 4 files changed, 20 insertions(+), 3 deletions(-)
+ 4 files changed, 18 insertions(+), 3 deletions(-)
 
 diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
-index 48b01ea2df19..59b87396fed2 100644
+index b59d73a9aae..2369d73b4e3 100644
 --- a/compiler/rustc_codegen_ssa/src/back/link.rs
 +++ b/compiler/rustc_codegen_ssa/src/back/link.rs
-@@ -1559,6 +1559,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat
+@@ -1583,6 +1583,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat
              return file_path;
          }
      }
@@ -39,18 +39,18 @@ index 48b01ea2df19..59b87396fed2 100644
  
  /// Add options making relocation sections in the produced ELF files read-only
 diff --git a/compiler/rustc_target/src/spec/json.rs b/compiler/rustc_target/src/spec/json.rs
-index f236be92b3b6..eea6e0c203d2 100644
+index 4b6de5e18f5..373301d85ab 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 {
+@@ -559,6 +559,7 @@ macro_rules! key {
-         forward!(linker_is_gnu_json);
+         key!(linker_is_gnu_json = "linker-is-gnu", bool);
-         forward!(pre_link_objects);
+         key!(pre_link_objects = "pre-link-objects", link_objects);
-         forward!(post_link_objects);
+         key!(post_link_objects = "post-link-objects", link_objects);
-+        forward_opt!(external_lib_path);
++        key!(external_lib_path, optional);
-         forward!(pre_link_objects_self_contained);
+         key!(pre_link_objects_self_contained = "pre-link-objects-fallback", link_objects);
-         forward!(post_link_objects_self_contained);
+         key!(post_link_objects_self_contained = "post-link-objects-fallback", link_objects);
- 
+         // Deserializes the backwards-compatible variants of `-Clink-self-contained`
-@@ -301,6 +302,7 @@ macro_rules! target_option_val {
+@@ -744,6 +745,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);
@@ -58,20 +58,11 @@ index f236be92b3b6..eea6e0c203d2 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
+index 7234d1dc63e..3ec85bbf279 100644
 --- a/compiler/rustc_target/src/spec/mod.rs
 +++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -1992,6 +1992,7 @@ pub struct TargetOptions {
+@@ -2301,6 +2301,7 @@ pub struct TargetOptions {
      /// Objects to link before and after all other object code.
      pub pre_link_objects: CrtObjects,
      pub post_link_objects: CrtObjects,
@@ -79,7 +70,7 @@ index 07fb1ce63f7c..c076c2836f84 100644
      /// 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 {
+@@ -2821,6 +2822,7 @@ fn default() -> TargetOptions {
              relro_level: RelroLevel::None,
              pre_link_objects: Default::default(),
              post_link_objects: Default::default(),
@@ -88,7 +79,7 @@ index 07fb1ce63f7c..c076c2836f84 100644
              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 26add451ed25..3eaf050e6823 100644
+index 26add451ed2..3eaf050e682 100644
 --- a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
 +++ b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
 @@ -21,11 +21,12 @@ pub(crate) fn target() -> Target {
@@ -108,5 +99,5 @@ index 26add451ed25..3eaf050e6823 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.51.0
+2.48.1
 

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

SOURCES/rust-pr142047.patch

@@ -0,0 +1,79 @@
+From 925e76167ce2465c5c9d990d97c2db99f459640b Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Wed, 4 Jun 2025 15:03:19 -0700
+Subject: [PATCH 1/2] Ensure stack in `ThirBuildCx::mirror_exprs`
+
+This solve a stack overflow found on Fedora s390x when building
+`tests/ui/parser/survive-peano-lesson-queue.rs`. Note that the singular
+`mirror_expr` method already has this stack check, but in this case the
+plural method was the one recursing too deeply.
+---
+ compiler/rustc_mir_build/src/thir/cx/expr.rs | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/compiler/rustc_mir_build/src/thir/cx/expr.rs b/compiler/rustc_mir_build/src/thir/cx/expr.rs
+index 226dc920a496c..78c168778ac9d 100644
+--- a/compiler/rustc_mir_build/src/thir/cx/expr.rs
++++ b/compiler/rustc_mir_build/src/thir/cx/expr.rs
+@@ -38,7 +38,10 @@ impl<'tcx> ThirBuildCx<'tcx> {
+     }
+ 
+     pub(crate) fn mirror_exprs(&mut self, exprs: &'tcx [hir::Expr<'tcx>]) -> Box<[ExprId]> {
+-        exprs.iter().map(|expr| self.mirror_expr_inner(expr)).collect()
++        // `mirror_exprs` may also recurse deeply, so it needs protection from stack overflow.
++        // Note that we *could* forward to `mirror_expr` for that, but we can consolidate the
++        // overhead of stack growth by doing it outside the iteration.
++        ensure_sufficient_stack(|| exprs.iter().map(|expr| self.mirror_expr_inner(expr)).collect())
+     }
+ 
+     #[instrument(level = "trace", skip(self, hir_expr))]
+
+From af2a85bd75c011fb3453a4963400918e096e1896 Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Wed, 4 Jun 2025 15:16:38 -0700
+Subject: [PATCH 2/2] Ensure stack in `Parser::parse_ty`
+
+This solve a stack overflow found on Fedora s390x when building
+`tests/ui/associated-consts/issue-93775.rs`.
+---
+ compiler/rustc_parse/src/parser/ty.rs | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/compiler/rustc_parse/src/parser/ty.rs b/compiler/rustc_parse/src/parser/ty.rs
+index 17481731b1107..6eaec2e29ad48 100644
+--- a/compiler/rustc_parse/src/parser/ty.rs
++++ b/compiler/rustc_parse/src/parser/ty.rs
+@@ -7,6 +7,7 @@ use rustc_ast::{
+     Pinnedness, PolyTraitRef, PreciseCapturingArg, TraitBoundModifiers, TraitObjectSyntax, Ty,
+     TyKind, UnsafeBinderTy,
+ };
++use rustc_data_structures::stack::ensure_sufficient_stack;
+ use rustc_errors::{Applicability, Diag, PResult};
+ use rustc_span::{ErrorGuaranteed, Ident, Span, kw, sym};
+ use thin_vec::{ThinVec, thin_vec};
+@@ -104,14 +105,17 @@ fn can_begin_dyn_bound_in_edition_2015(t: &Token) -> bool {
+ impl<'a> Parser<'a> {
+     /// Parses a type.
+     pub fn parse_ty(&mut self) -> PResult<'a, P<Ty>> {
+-        self.parse_ty_common(
+-            AllowPlus::Yes,
+-            AllowCVariadic::No,
+-            RecoverQPath::Yes,
+-            RecoverReturnSign::Yes,
+-            None,
+-            RecoverQuestionMark::Yes,
+-        )
++        // Make sure deeply nested types don't overflow the stack.
++        ensure_sufficient_stack(|| {
++            self.parse_ty_common(
++                AllowPlus::Yes,
++                AllowCVariadic::No,
++                RecoverQPath::Yes,
++                RecoverReturnSign::Yes,
++                None,
++                RecoverQuestionMark::Yes,
++            )
++        })
+     }
+ 
+     pub(super) fn parse_ty_with_generics_recovery(

SOURCES/rustc-1.88.0-disable-libssh2.patch

@@ -1,7 +1,7 @@
 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.orig	2025-06-13 15:47:08.609927319 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2025-08-18 17:31:39.554771554 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2025-06-13 15:47:54.463092386 -0700
-@@ -2800,7 +2800,6 @@ checksum = "1c42fe03df2bd3c53a3a9c7317ad
+@@ -2530,7 +2530,6 @@ checksum = "e1a117465e7e1597e8febea8bb0c
  dependencies = [
   "cc",
   "libc",
@@ -9,7 +9,7 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools
   "libz-sys",
   "openssl-sys",
   "pkg-config",
-@@ -2847,20 +2846,6 @@ dependencies = [
+@@ -2576,20 +2575,6 @@ dependencies = [
   "pkg-config",
   "vcpkg",
  ]
@@ -31,14 +31,14 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools
  [[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.orig	2025-06-13 15:47:08.610402846 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2025-08-18 17:33:02.401743230 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2025-06-13 15:47:51.696071356 -0700
-@@ -46,7 +46,7 @@ curl = "0.4.48"
+@@ -46,7 +46,7 @@ curl = "0.4.47"
- curl-sys = "0.4.83"
+ curl-sys = "0.4.79"
- filetime = "0.2.26"
+ filetime = "0.2.25"
- flate2 = { version = "1.1.2", default-features = false, features = ["zlib-rs"] }
+ flate2 = { version = "1.1.1", default-features = false, features = ["zlib-rs"] }
--git2 = "0.20.2"
+-git2 = "0.20.0"
-+git2 = { version = "0.20.2", default-features = false, features = ["https"] }
++git2 = { version = "0.20.0", 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"] }
+ gix = { version = "0.71.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] }

SOURCES/rustc-1.88.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-06-13 01:10:18.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2025-06-13 15:39:38.597882622 -0700
+@@ -2573,7 +2573,6 @@ version = "0.32.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "fbb8270bb4060bd76c6e96f20c52d80620f1d82a3470885694e41e0f81ef6fe7"
+ 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-06-13 01:10:18.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2025-06-13 15:39:34.583102112 -0700
+@@ -80,7 +80,7 @@ proptest = "1.6.0"
+ pulldown-cmark = { version = "0.13.0", default-features = false, features = ["html"] }
+ rand = "0.9.0"
+ regex = "1.11.1"
+-rusqlite = { version = "0.34.0", features = ["bundled"] }
++rusqlite = { version = "0.34.0", features = [] }
+ rustc-hash = "2.1.1"
+ rustc-stable-hash = "0.1.2"
+ rustfix = { version = "0.9.0", path = "crates/rustfix" }

SOURCES/rustc-1.92.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	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" }

SPECS/rust.spec

@@ -1,6 +1,16 @@
+## START: Set by rpmautospec
+## (rpmautospec version 0.6.5)
+## RPMAUTOSPEC: autorelease, autochangelog
+%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
+    release_number = 1;
+    base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
+    print(release_number + base_release_number - 1);
+}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
+## END: Set by rpmautospec
+
 Name:           rust
-Version:        1.92.0
+Version:        1.88.0
-Release:        1%{?dist}
+Release:        %autorelease
 Summary:        The Rust Programming Language
 License:        (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-3.0)
 # ^ written as: (rust itself) and (bundled libraries)
@@ -12,11 +22,11 @@ URL:            https://www.rust-lang.org
 ExclusiveArch:  %{rust_arches}
 
 # To bootstrap from scratch, set the channel and date from src/stage0
-# e.g. 1.89.0 wants rustc: 1.88.0-2025-06-26
+# e.g. 1.88.0 wants rustc: 1.87.0-2025-05-15
 # or nightly wants some beta-YYYY-MM-DD
-%global bootstrap_version 1.91.0
+%global bootstrap_version 1.87.0
-%global bootstrap_channel 1.91.0
+%global bootstrap_channel 1.87.0
-%global bootstrap_date 2025-10-30
+%global bootstrap_date 2025-05-15
 
 # Only the specified arches will use bootstrap binaries.
 # NOTE: Those binaries used to be uploaded with every new release, but that was
@@ -28,7 +38,8 @@ ExclusiveArch:  %{rust_arches}
 # We need CRT files for *-wasi targets, at least as new as the commit in
 # src/ci/docker/host-x86_64/dist-various-2/build-wasi-toolchain.sh
 %global wasi_libc_url https://github.com/WebAssembly/wasi-libc
-%global wasi_libc_ref wasi-sdk-27
+#global wasi_libc_ref wasi-sdk-25
+%global wasi_libc_ref 640c0cfc19a96b099e0791824be5ef0105ce2084
 %global wasi_libc_name wasi-libc-%{wasi_libc_ref}
 %global wasi_libc_source %{wasi_libc_url}/archive/%{wasi_libc_ref}/%{wasi_libc_name}.tar.gz
 %global wasi_libc_dir %{_builddir}/%{wasi_libc_name}
@@ -44,8 +55,8 @@ ExclusiveArch:  %{rust_arches}
 # We can also choose to just use Rust's bundled LLVM, in case the system LLVM
 # is insufficient. Rust currently requires LLVM 19.0+.
 # See src/bootstrap/src/core/build_steps/llvm.rs, fn check_llvm_version
-%global min_llvm_version 20.0.0
+%global min_llvm_version 19.0.0
-%global bundled_llvm_version 21.1.3
+%global bundled_llvm_version 20.1.5
 #global llvm_compat_version 19
 %global llvm llvm%{?llvm_compat_version}
 %bcond_with bundled_llvm
@@ -54,7 +65,7 @@ ExclusiveArch:  %{rust_arches}
 # This needs to be consistent with the bindings in vendor/libgit2-sys.
 %global min_libgit2_version 1.9.0
 %global next_libgit2_version 1.10.0~
-%global bundled_libgit2_version 1.9.1
+%global bundled_libgit2_version 1.9.0
 %if 0%{?fedora} >= 41
 %bcond_with bundled_libgit2
 %else
@@ -62,7 +73,7 @@ ExclusiveArch:  %{rust_arches}
 %endif
 
 # Try to use system oniguruma (only used at build time for rust-docs)
-# src/tools/rustbook -> ... -> onig_sys v69.9.1 needs at least 6.9.3
+# src/tools/rustbook -> ... -> onig_sys v69.8.1 needs at least 6.9.3
 %global min_oniguruma_version 6.9.3
 %if 0%{?rhel} && 0%{?rhel} < 9
 %bcond_without bundled_oniguruma
@@ -72,7 +83,7 @@ ExclusiveArch:  %{rust_arches}
 
 # Cargo uses UPSERTs with omitted conflict targets
 %global min_sqlite3_version 3.35
-%global bundled_sqlite3_version 3.50.2
+%global bundled_sqlite3_version 3.49.1
 %if 0%{?rhel} && 0%{?rhel} < 10
 %bcond_without bundled_sqlite3
 %else
@@ -88,7 +99,7 @@ ExclusiveArch:  %{rust_arches}
 
 # Reduce rustc's own debuginfo and optimizations to conserve 32-bit memory.
 # e.g. https://github.com/rust-lang/rust/issues/45854
-%global reduced_debuginfo 0
+%global reduced_debuginfo 1
 %if 0%{?__isa_bits} == 32
 %global reduced_debuginfo 1
 %endif
@@ -138,10 +149,11 @@ Patch4:         0001-bootstrap-allow-disabling-target-self-contained.patch
 Patch5:         0002-set-an-external-library-path-for-wasm32-wasi.patch
 
 # We don't want to use the bundled library in libsqlite3-sys
-Patch6:         rustc-1.92.0-unbundle-sqlite.patch
+Patch6:         rustc-1.88.0-unbundle-sqlite.patch
 
-# stage0 tries to copy all of /usr/lib, sometimes unsuccessfully, see #143735
+# Ensure stack in two places that affect s390x
-Patch7:         0001-only-copy-rustlib-into-stage0-sysroot.patch
+# https://github.com/rust-lang/rust/pull/142047
+Patch7:         rust-pr142047.patch
 
 ### RHEL-specific patches below ###
 
@@ -151,7 +163,7 @@ Source101:      cargo_vendor.attr
 Source102:      cargo_vendor.prov
 
 # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949)
-Patch100:       rustc-1.92.0-disable-libssh2.patch
+Patch100:       rustc-1.88.0-disable-libssh2.patch
 
 # Get the Rust triple for any architecture and ABI.
 %{lua: function rust_triple(arch, abi)
@@ -242,11 +254,8 @@ BuildRequires:  (%{name} >= %{bootstrap_version} with %{name} <= %{version})
 %endif
 
 BuildRequires:  make
-BuildRequires:  gcc-toolset-14-annobin-plugin-gcc
+BuildRequires:  gcc
-BuildRequires:  gcc-toolset-14-gcc-plugin-annobin
+BuildRequires:  gcc-c++
-BuildRequires:  gcc-toolset-14-binutils
-BuildRequires:  gcc-toolset-14-gcc
-BuildRequires:  gcc-toolset-14-gcc-c++
 BuildRequires:  ncurses-devel
 # explicit curl-devel to avoid httpd24-curl (rhbz1540167)
 BuildRequires:  curl-devel
@@ -294,7 +303,6 @@ BuildRequires:  %{llvm}-devel >= %{min_llvm_version}
 %if %with llvm_static
 BuildRequires:  %{llvm}-static
 BuildRequires:  libffi-devel
-BuildRequires:  libxml2-devel
 %endif
 %endif
 
@@ -303,6 +311,10 @@ BuildRequires:  procps-ng
 
 # debuginfo-gdb tests need gdb
 BuildRequires:  gdb
+# Work around https://bugzilla.redhat.com/show_bug.cgi?id=2275274:
+# gdb currently prints a "Unable to load 'rpm' module. Please install the python3-rpm package."
+# message that breaks version detection.
+BuildRequires:  python3-rpm
 
 # For src/test/run-make/static-pie
 BuildRequires:  glibc-static
@@ -373,6 +385,7 @@ BuildRequires:  compiler-rt%{?llvm_compat_version}
 # https://github.com/rust-lang/rust/pull/101841
 Obsoletes:      %{name}-analysis < 1.69.0~
 
+%ifnarch %{bootstrap_arches}
 # Experimenting with a fine-grained version of %%cargo_vendor_manifest,
 # so we can have different bundled provides for each tool subpackage.
 %define cargo_tree_manifest(n:m:f:t:) (       \
@@ -381,7 +394,6 @@ Obsoletes:      %{name}-analysis < 1.69.0~
   mkdir -p build/manifests/%{-n*}             \
   %{shrink:                                   \
     env RUSTC_BOOTSTRAP=1                     \
-      RUSTC=%{local_rust_root}/bin/rustc      \
       %{local_rust_root}/bin/cargo tree       \
       --offline --edges normal,build          \
       --prefix none --format "{p}"            \
@@ -394,7 +406,6 @@ Obsoletes:      %{name}-analysis < 1.69.0~
     >build/manifests/%{-n*}/cargo-vendor.txt  \
   }                                           \
 )
-%ifnarch %{bootstrap_arches}
 %{?fedora:BuildRequires: cargo-rpm-macros}
 %{?rhel:BuildRequires: rust-toolset}
 %endif
@@ -507,8 +518,6 @@ Summary:        GDB pretty printers for Rust
 BuildArch:      noarch
 Requires:       gdb
 Requires:       %{name}-debugger-common = %{version}-%{release}
-# rust-gdb uses rustc to find the sysroot
-Requires:       %{name} = %{version}-%{release}
 
 %description gdb
 This package includes the rust-gdb script, which allows easier debugging of Rust
@@ -519,10 +528,8 @@ programs.
 Summary:        LLDB pretty printers for Rust
 BuildArch:      noarch
 Requires:       lldb
-Requires:       python3.12-lldb
+Requires:       python3-lldb
 Requires:       %{name}-debugger-common = %{version}-%{release}
-# rust-lldb uses rustc to find the sysroot
-Requires:       %{name} = %{version}-%{release}
 
 %description lldb
 This package includes the rust-lldb script, which allows easier debugging of Rust
@@ -734,7 +741,7 @@ sed -i.lzma -e '/LZMA_API_STATIC/d' src/bootstrap/src/core/build_steps/tool.rs
 %if %{without bundled_llvm} && %{with llvm_static}
 # Static linking to distro LLVM needs to add -lffi
 # https://github.com/rust-lang/rust/issues/34486
-sed -i.ffi -e '$a #[link(name = "ffi")] extern "C" {}' \
+sed -i.ffi -e '$a #[link(name = "ffi")] extern {}' \
   compiler/rustc_llvm/src/lib.rs
 %endif
 
@@ -777,7 +784,7 @@ end}
   %{!?with_disabled_libssh2:LIBSSH2_SYS_USE_PKG_CONFIG=1}
   %{?llvm_path:PATH="%{llvm_path}:$PATH"}
 }
-%global export_rust_env export %{rust_env} ; source /opt/rh/gcc-toolset-14/enable
+%global export_rust_env export %{rust_env}
 
 %build
 %{export_rust_env}
@@ -831,20 +838,11 @@ end}
 %endif
 %endif
 
-# Find the compiler-rt library for the Rust profiler_builtins and optimized-builtins crates.
+# Find the compiler-rt library for the Rust profiler_builtins crate.
 %define clang_lib %{expand:%%clang%{?llvm_compat_version}_resource_dir}/lib
 %define profiler %{clang_lib}/%{_arch}-redhat-linux-gnu/libclang_rt.profile.a
 test -r "%{profiler}"
 
-# llvm < 21 does not provide a builtins library for s390x.
-%if "%{_arch}" != "s390x" || 0%{?clang_major_version} >= 21
-%define optimized_builtins %{clang_lib}/%{_arch}-redhat-linux-gnu/libclang_rt.builtins.a
-test -r "%{optimized_builtins}"
-%else
-%define optimized_builtins false
-%endif
-
-
 %configure --disable-option-checking \
   --docdir=%{_pkgdocdir} \
   --libdir=%{common_libdir} \
@@ -855,7 +853,6 @@ test -r "%{optimized_builtins}"
   --set target.%{rust_triple}.ar=%{__ar} \
   --set target.%{rust_triple}.ranlib=%{__ranlib} \
   --set target.%{rust_triple}.profiler="%{profiler}" \
-  --set target.%{rust_triple}.optimized-compiler-builtins="%{optimized_builtins}" \
   %{?mingw_target_config} \
   %{?wasm_target_config} \
   --python=%{__python3} \
@@ -876,9 +873,8 @@ test -r "%{optimized_builtins}"
   --set build.test-stage=2 \
   --set build.optimized-compiler-builtins=false \
   --set rust.llvm-tools=false \
-  --set rust.verify-llvm-ir=true \
   --enable-extended \
-  --tools=cargo,clippy,rust-analyzer,rustdoc,rustfmt,src \
+  --tools=cargo,clippy,rust-analyzer,rustfmt,src \
   --enable-vendor \
   --enable-verbose-tests \
   --release-channel=%{channel} \
@@ -886,7 +882,11 @@ test -r "%{optimized_builtins}"
 
 %global __x %{__python3} ./x.py
 
-%if %{with rustc_pgo}
+# - rustc is exibiting signs of miscompilation on pwr9+pgo (root cause TBD),
+#   so we're skipping pgo on rhel ppc64le for now. See RHEL-88598 for more.
+# - Since 1.87, Fedora started getting ppc64le segfaults, and this also seems
+#   to be avoidable by skipping pgo. See bz2367960 for examples of that.
+%if %{with rustc_pgo} && !( "%{_target_cpu}" == "ppc64le" )
 # Build the compiler with profile instrumentation
 %define profraw $PWD/build/profiles
 %define profdata $PWD/build/rustc.profdata
@@ -896,9 +896,7 @@ mkdir -p "%{profraw}"
 # We normally use `x.py`, but in this case we invoke the stage 2 compiler and libs
 # directly to ensure we use the instrumented compiler.
 env LLVM_PROFILE_FILE="%{profraw}/default_%%m_%%p.profraw" \
-  LD_LIBRARY_PATH=$PWD/build/host/stage2/lib \
+  %{__x} --keep-stage=0 --keep-stage=1 build cargo
-  RUSTC=$PWD/build/host/stage2/bin/rustc \
-  cargo build --manifest-path=src/tools/cargo/Cargo.toml
 # Finalize the profile data and clean up the raw files
 llvm-profdata merge -o "%{profdata}" "%{profraw}"
 rm -r "%{profraw}" build/%{rust_triple}/stage2*/
@@ -917,6 +915,7 @@ for triple in %{?all_targets} ; do
   %{__x} build --target=$triple std
 done
 
+%ifnarch %{bootstrap_arches}
 # Collect cargo-vendor.txt for each tool and std
 %{cargo_tree_manifest -n rustc -- -p rustc-main -p rustdoc}
 %{cargo_tree_manifest -n cargo -m src/tools/cargo}
@@ -932,6 +931,8 @@ for triple in %{?all_targets} ; do
   esac
 done
 
+%endif
+
 %install
 %if 0%{?rhel} && 0%{?rhel} <= 9
 %{?set_build_flags}
@@ -1044,41 +1045,21 @@ rm -rf "$TMP_HELLO"
 # - Crashes are excluded because they are less reliable, especially stuff like
 #   SIGSEGV across different arches -- UB can do all kinds of weird things.
 #   They're only meant to notice "accidental" fixes anyway, not *should* crash.
-timeout -v 90m %{__x} test --no-fail-fast --skip={src/bootstrap,tests/crashes} || :
+%{__x} test --no-fail-fast --skip={src/bootstrap,tests/crashes} || :
 rm -rf "./build/%{rust_triple}/test/"
 
-# Cargo tests skip list
-# Every test skipped here must have a documented reason to be skipped.
-# Duplicates are safe to add.
-
-# This test relies on the DNS to fail to resolve the host. DNS is not enabled
-# in mock in koji so the DNS resolution doesn't take place to begin with.
-# We test this after packaging
-%global cargo_test_skip_list net_err_suggests_fetch_with_cli
-
 %ifarch aarch64
 # https://github.com/rust-lang/rust/issues/123733
-%global cargo_test_skip_list %{cargo_test_skip_list} panic_abort_doc_tests
+%define cargo_test_skip --test-args "--skip panic_abort_doc_tests"
 %endif
-%if %with disabled_libssh2
+%{__x} test --no-fail-fast cargo %{?cargo_test_skip} || :
-# These tests need ssh - guaranteed to fail when libssh2 is disabled.
-%global cargo_test_skip_list %{shrink:
-  %{cargo_test_skip_list}
-  net_err_suggests_fetch_with_cli
-  ssh_something_happens
-}
-%endif
-%if "%{cargo_test_skip_list}" != ""
-%define cargo_test_skip --test-args "%(printf -- '--skip %%s ' %{cargo_test_skip_list})"
-%endif
-timeout -v 30m %{__x} test --no-fail-fast cargo %{?cargo_test_skip} || :
 rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 
-timeout -v 30m %{__x} test --no-fail-fast clippy || :
+%{__x} test --no-fail-fast clippy || :
 
-timeout -v 30m %{__x} test --no-fail-fast rust-analyzer || :
+%{__x} test --no-fail-fast rust-analyzer || :
 
-timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
+%{__x} test --no-fail-fast rustfmt || :
 
 %ldconfig_scriptlets
 
@@ -1092,10 +1073,11 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 %{_libexecdir}/rust-analyzer-proc-macro-srv
 %{_mandir}/man1/rustc.1*
 %{_mandir}/man1/rustdoc.1*
+%ifnarch %{bootstrap_arches}
 %license build/manifests/rustc/cargo-vendor.txt
+%endif
 %license %{_pkgdocdir}/COPYRIGHT.html
 %license %{_pkgdocdir}/licenses/
-%exclude %{_sysconfdir}/target-spec-json-schema.json
 
 
 %files std-static
@@ -1104,7 +1086,9 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 %dir %{rustlibdir}/%{rust_triple}/lib
 %{rustlibdir}/%{rust_triple}/lib/*.rlib
 %{rustlibdir}/%{rust_triple}/lib/*.so
+%ifnarch %{bootstrap_arches}
 %license build/manifests/std/cargo-vendor.txt
+%endif
 %license %{_pkgdocdir}/COPYRIGHT-library.html
 
 %global target_files()      \
@@ -1112,8 +1096,7 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 %dir %{rustlibdir}          \
 %dir %{rustlibdir}/%1       \
 %dir %{rustlibdir}/%1/lib   \
-%{rustlibdir}/%1/lib/*.rlib \
+%{rustlibdir}/%1/lib/*.rlib
-%license build/manifests/std-%1/cargo-vendor.txt
 
 %if %target_enabled i686-pc-windows-gnu
 %target_files i686-pc-windows-gnu
@@ -1195,7 +1178,9 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 %{_datadir}/zsh/site-functions/_cargo
 %dir %{_datadir}/cargo
 %dir %{_datadir}/cargo/registry
+%ifnarch %{bootstrap_arches}
 %license build/manifests/cargo/cargo-vendor.txt
+%endif
 
 
 %files -n rustfmt
@@ -1203,14 +1188,18 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 %{_bindir}/cargo-fmt
 %doc src/tools/rustfmt/{README,CHANGELOG,Configurations}.md
 %license src/tools/rustfmt/LICENSE-{APACHE,MIT}
+%ifnarch %{bootstrap_arches}
 %license build/manifests/rustfmt/cargo-vendor.txt
+%endif
 
 
 %files analyzer
 %{_bindir}/rust-analyzer
 %doc src/tools/rust-analyzer/README.md
 %license src/tools/rust-analyzer/LICENSE-{APACHE,MIT}
+%ifnarch %{bootstrap_arches}
 %license build/manifests/rust-analyzer/cargo-vendor.txt
+%endif
 
 
 %files -n clippy
@@ -1218,7 +1207,9 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 %{_bindir}/clippy-driver
 %doc src/tools/clippy/{README.md,CHANGELOG.md}
 %license src/tools/clippy/LICENSE-{APACHE,MIT}
+%ifnarch %{bootstrap_arches}
 %license build/manifests/clippy/cargo-vendor.txt
+%endif
 
 
 %files src
@@ -1235,28 +1226,20 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 
 
 %changelog
-* Wed Jan 07 2026 Josh Stone <jistone@redhat.com> - 1.92.0-1
+## START: Generated by rpmautospec
-- Update to 1.92.0
-
-* Fri Nov 07 2025 Josh Stone <jistone@redhat.com> - 1.91.0-1
-- Update to 1.91.0
-
-* Fri Nov 07 2025 Josh Stone <jistone@redhat.com> - 1.90.0-1
-- Update to 1.90.0
-
-* Thu Nov 06 2025 Josh Stone <jistone@redhat.com> - 1.89.0-1
-- Update to 1.89.0
-
 * Fri Jul 11 2025 Josh Stone <jistone@redhat.com> - 1.88.0-1
-- Update to 1.88.0
+- Update to Rust 1.88.0
 
 * Thu May 29 2025 Josh Stone <jistone@redhat.com> - 1.87.0-1
 - Update to 1.87.0
 
-* Wed Apr 30 2025 Josh Stone <jistone@redhat.com> - 1.86.0-1
+* Thu Apr 24 2025 Josh Stone <jistone@redhat.com> - 1.86.0-2
+- Temporarily skip PGO on RHEL ppc64le
+
+* Tue Apr 08 2025 Josh Stone <jistone@redhat.com> - 1.86.0-1
 - Update to 1.86.0
 
-* Tue Apr 29 2025 Josh Stone <jistone@redhat.com> - 1.85.0-1
+* Mon Mar 03 2025 Josh Stone <jistone@redhat.com> - 1.85.0-1
 - Update to 1.85.0
 
 * Tue Feb 04 2025 Josh Stone <jistone@redhat.com> - 1.84.1-1
@@ -1281,23 +1264,31 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 * Tue Aug 13 2024 Josh Stone <jistone@redhat.com> - 1.79.0-2
 - Disable jump threading of float equality
 
-* Fri Jun 21 2024 Josh Stone <jistone@redhat.com> - 1.79.0-1
+* Wed Jul 03 2024 Nikita Popov <npopov@redhat.com> - 1.79.0-1
 - Update to 1.79.0
 
-* Fri Jun 21 2024 Josh Stone <jistone@redhat.com> - 1.78.0-1
+* Tue Jun 18 2024 Nikita Popov <npopov@redhat.com> - 1.78.0-1
 - Update to 1.78.0
-- Make std-static-wasm* noarch again
 
-* Thu May 09 2024 Josh Stone <jistone@redhat.com> - 1.77.2-1
+* Thu May 02 2024 Josh Stone <jistone@redhat.com> - 1.77.2-3
+- Fix the coverage-dump tool for tests.
+
+* Tue Apr 30 2024 Josh Stone <jistone@redhat.com> - 1.77.2-2
+- Use bundled sqlite3 when the system version is too old.
+
+* Fri Apr 19 2024 Josh Stone <jistone@redhat.com> - 1.77.2-1
 - Update to 1.77.2.
 
-* Wed Apr 17 2024 Josh Stone <jistone@redhat.com> - 1.76.0-1
+* Tue Apr 16 2024 Josh Stone <jistone@redhat.com> - 1.76.0-1
 - Update to 1.76.0.
 - Sync rust-toolset macros to rust-packaging v25.2
 
 * Fri Jan 05 2024 Josh Stone <jistone@redhat.com> - 1.75.0-1
 - Update to 1.75.0.
 
+* Fri Jan 05 2024 Josh Stone <jistone@redhat.com> - 1.74.1-2
+- Rebuild in a new side-tag.
+
 * Wed Jan 03 2024 Josh Stone <jistone@redhat.com> - 1.74.1-1
 - Update to 1.74.1.
 
@@ -1323,14 +1314,14 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 * Tue Jul 18 2023 Josh Stone <jistone@redhat.com> - 1.70.0-1
 - Update to 1.70.0.
 
-* Fri May 26 2023 Josh Stone <jistone@redhat.com> - 1.69.0-1
+* Wed May 10 2023 Josh Stone <jistone@redhat.com> - 1.69.0-1
 - Update to 1.69.0.
 - Obsolete rust-analysis.
 
-* Fri May 19 2023 Josh Stone <jistone@redhat.com> - 1.68.2-1
+* Tue May 09 2023 Josh Stone <jistone@redhat.com> - 1.68.2-1
 - Update to 1.68.2.
 
-* Thu May 18 2023 Josh Stone <jistone@redhat.com> - 1.67.1-1
+* Mon May 08 2023 Josh Stone <jistone@redhat.com> - 1.67.1-1
 - Update to 1.67.1.
 
 * Wed Jan 11 2023 Josh Stone <jistone@redhat.com> - 1.66.1-1
@@ -1340,6 +1331,9 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 - Update to 1.65.0.
 - rust-analyzer now obsoletes rls.
 
+* Wed Oct 12 2022 Josh Stone <jistone@redhat.com> - 1.64.0-2
+- Rebuild for LLVM 15.0.1.
+
 * Thu Sep 22 2022 Josh Stone <jistone@redhat.com> - 1.64.0-1
 - Update to 1.64.0.
 - Add rust-analyzer.
@@ -1375,65 +1369,106 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 * Wed Dec 15 2021 Josh Stone <jistone@redhat.com> - 1.57.0-1
 - Update to 1.57.0.
 
-* Thu Dec 02 2021 Josh Stone <jistone@redhat.com> - 1.56.1-2
+* Wed Dec 01 2021 Josh Stone <jistone@redhat.com> - 1.56.1-2
 - Add rust-std-static-wasm32-wasi
-  Resolves: rhbz#1980080
+  Resolves: rhbz#1980082
 
-* Tue Nov 02 2021 Josh Stone <jistone@redhat.com> - 1.56.0-1
+* Thu Nov 04 2021 Josh Stone <jistone@redhat.com> - 1.56.1-1
 - Update to 1.56.1.
 
 * Fri Oct 29 2021 Josh Stone <jistone@redhat.com> - 1.55.0-1
 - Update to 1.55.0.
-- Backport support for LLVM 13.
 
-* Tue Aug 17 2021 Josh Stone <jistone@redhat.com> - 1.54.0-2
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.54.0-2
-- Make std-static-wasm* arch-specific to avoid s390x.
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Thu Jul 29 2021 Josh Stone <jistone@redhat.com> - 1.54.0-1
+* Wed Aug 04 2021 Josh Stone <jistone@redhat.com> - 1.54.0-1
 - Update to 1.54.0.
 
-* Tue Jul 20 2021 Josh Stone <jistone@redhat.com> - 1.53.0-2
+* Tue Jun 22 2021 Josh Stone <jistone@redhat.com> - 1.53.0-1
-- Use llvm-ranlib to fix wasm archives.
-
-* Mon Jun 21 2021 Josh Stone <jistone@redhat.com> - 1.53.0-1
 - Update to 1.53.0.
+- Update openssl crates to published versions for 3.0 support.
 
-* Tue Jun 15 2021 Josh Stone <jistone@redhat.com> - 1.52.1-2
+* Tue Jun 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.52.1-4
+- Rebuilt for RHEL 9 BETA for openssl 3.0
+
+* Mon Jun 07 2021 Josh Stone <jistone@redhat.com> - 1.52.1-3
 - Set rust.codegen-units-std=1 for all targets again.
 - Add rust-std-static-wasm32-unknown-unknown.
 
-* Tue May 25 2021 Josh Stone <jistone@redhat.com> - 1.52.1-1
+* Tue May 18 2021 Josh Stone <jistone@redhat.com> - 1.52.1-2
+- Rebuild for OpenSSL 3.0.0-alpha16
+
+* Thu May 13 2021 Josh Stone <jistone@redhat.com> - 1.52.1-1
 - Update to 1.52.1. Includes security fixes for CVE-2020-36323,
   CVE-2021-28876, CVE-2021-28878, CVE-2021-28879, and CVE-2021-31162.
+- Initial support for OpenSSL 3.0.0-alpha15
 
-* Mon May 24 2021 Josh Stone <jistone@redhat.com> - 1.51.0-1
+* Wed Apr 28 2021 Josh Stone <jistone@redhat.com> - 1.51.0-1
-- Update to 1.51.0. Update to 1.51.0. Includes security fixes for
+- Update to 1.51.0. Includes security fixes for CVE-2021-28875
-  CVE-2021-28875 and CVE-2021-28877.
+  and CVE-2021-28877.
 
-* Mon May 24 2021 Josh Stone <jistone@redhat.com> - 1.50.0-1
+* Tue Apr 27 2021 Josh Stone <jistone@redhat.com> - 1.50.0-1
 - Update to 1.50.0.
 
-* Wed Jan 13 2021 Josh Stone <jistone@redhat.com> - 1.49.0-1
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.49.0-5
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Fri Feb 12 2021 Josh Stone <jistone@redhat.com> - 1.49.0-4
+- Rebuild without bootstrap binaries
+
+* Thu Feb 11 2021 Josh Stone <jistone@redhat.com> - 1.49.0-3
+- Re-bootstrap due to removed LLVM targets
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.49.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 05 2021 Josh Stone <jistone@redhat.com> - 1.49.0-1
 - Update to 1.49.0.
 
-* Tue Jan 12 2021 Josh Stone <jistone@redhat.com> - 1.48.0-1
+* Tue Dec 29 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.48.0-3
+- De-bootstrap
+
+* Mon Dec 28 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 1.48.0-2
+- Rebuild for libgit2 1.1.x
+
+* Thu Nov 19 2020 Josh Stone <jistone@redhat.com> - 1.48.0-1
 - Update to 1.48.0.
 
-* Thu Oct 22 2020 Josh Stone <jistone@redhat.com> - 1.47.0-1
+* Sat Oct 10 2020 Jeff Law <law@redhat.com> - 1.47.0-2
+- Re-enable LTO
+
+* Thu Oct 08 2020 Josh Stone <jistone@redhat.com> - 1.47.0-1
 - Update to 1.47.0.
 
-* Wed Oct 14 2020 Josh Stone <jistone@redhat.com> - 1.46.0-1
+* Fri Aug 28 2020 Fabio Valentini <decathorpe@gmail.com> - 1.46.0-2
+- Fix LTO with doctests (backported cargo PR#8657).
+
+* Thu Aug 27 2020 Josh Stone <jistone@redhat.com> - 1.46.0-1
 - Update to 1.46.0.
 
-* Tue Aug 04 2020 Josh Stone <jistone@redhat.com> - 1.45.2-1
+* Mon Aug 03 2020 Josh Stone <jistone@redhat.com> - 1.45.2-1
 - Update to 1.45.2.
 
+* Thu Jul 30 2020 Josh Stone <jistone@redhat.com> - 1.45.1-1
+- Update to 1.45.1.
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.45.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Thu Jul 16 2020 Josh Stone <jistone@redhat.com> - 1.45.0-1
 - Update to 1.45.0.
 
-* Tue Jul 14 2020 Josh Stone <jistone@redhat.com> - 1.44.1-1
+* Wed Jul 01 2020 Jeff Law <law@redhat.com> - 1.44.1-2
+- Disable LTO
+
+* Thu Jun 18 2020 Josh Stone <jistone@redhat.com> - 1.44.1-1
 - Update to 1.44.1.
 
+* Thu Jun 04 2020 Josh Stone <jistone@redhat.com> - 1.44.0-1
+- Update to 1.44.0.
+
 * Thu May 07 2020 Josh Stone <jistone@redhat.com> - 1.43.1-1
 - Update to 1.43.1.
 
@@ -1446,27 +1481,39 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 * Thu Feb 27 2020 Josh Stone <jistone@redhat.com> - 1.41.1-1
 - Update to 1.41.1.
 
+* Thu Feb 20 2020 Josh Stone <jistone@redhat.com> - 1.41.0-2
+- Rebuild with llvm9.0
+
 * Thu Jan 30 2020 Josh Stone <jistone@redhat.com> - 1.41.0-1
 - Update to 1.41.0.
 
-* Thu Jan 16 2020 Josh Stone <jistone@redhat.com> - 1.40.0-1
+* Thu Jan 16 2020 Josh Stone <jistone@redhat.com> - 1.40.0-3
-- Update to 1.40.0.
-- Fix compiletest with newer (local-rebuild) libtest
 - Build compiletest with in-tree libtest
+
+* Tue Jan 07 2020 Josh Stone <jistone@redhat.com> - 1.40.0-2
+- Fix compiletest with newer (local-rebuild) libtest
 - Fix ARM EHABI unwinding
 
+* Thu Dec 19 2019 Josh Stone <jistone@redhat.com> - 1.40.0-1
+- Update to 1.40.0.
+
 * Tue Nov 12 2019 Josh Stone <jistone@redhat.com> - 1.39.0-2
 - Fix a couple build and test issues with rustdoc.
 
 * Thu Nov 07 2019 Josh Stone <jistone@redhat.com> - 1.39.0-1
 - Update to 1.39.0.
 
+* Fri Sep 27 2019 Josh Stone <jistone@redhat.com> - 1.38.0-2
+- Filter the libraries included in rust-std (rhbz1756487)
+
 * Thu Sep 26 2019 Josh Stone <jistone@redhat.com> - 1.38.0-1
 - Update to 1.38.0.
 
 * Thu Aug 15 2019 Josh Stone <jistone@redhat.com> - 1.37.0-1
 - Update to 1.37.0.
-- Disable libssh2 (git+ssh support).
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.36.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
 * Thu Jul 04 2019 Josh Stone <jistone@redhat.com> - 1.36.0-1
 - Update to 1.36.0.
@@ -1480,88 +1527,261 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 * Tue May 14 2019 Josh Stone <jistone@redhat.com> - 1.34.2-1
 - Update to 1.34.2 -- fixes CVE-2019-12083.
 
-* Thu May 09 2019 Josh Stone <jistone@redhat.com> - 1.34.1-1
+* Tue Apr 30 2019 Josh Stone <jistone@redhat.com> - 1.34.1-3
+- Set rust.codegen-units-std=1
+
+* Fri Apr 26 2019 Josh Stone <jistone@redhat.com> - 1.34.1-2
+- Remove the ThinLTO workaround.
+
+* Thu Apr 25 2019 Josh Stone <jistone@redhat.com> - 1.34.1-1
 - Update to 1.34.1.
+- Add a ThinLTO fix for rhbz1701339.
 
 * Thu Apr 11 2019 Josh Stone <jistone@redhat.com> - 1.34.0-1
 - Update to 1.34.0.
 
-* Wed Apr 10 2019 Josh Stone <jistone@redhat.com> - 1.33.0-1
+* Fri Mar 01 2019 Josh Stone <jistone@redhat.com> - 1.33.0-2
+- Fix deprecations for self-rebuild
+
+* Thu Feb 28 2019 Josh Stone <jistone@redhat.com> - 1.33.0-1
 - Update to 1.33.0.
 
-* Tue Apr 09 2019 Josh Stone <jistone@redhat.com> - 1.32.0-1
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.32.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jan 17 2019 Josh Stone <jistone@redhat.com> - 1.32.0-1
 - Update to 1.32.0.
 
-* Fri Dec 14 2018 Josh Stone <jistone@redhat.com> - 1.31.0-5
+* Mon Jan 07 2019 Josh Stone <jistone@redhat.com> - 1.31.1-9
-- Restore rust-lldb.
+- Update to 1.31.1 for RLS fixes.
 
-* Thu Dec 13 2018 Josh Stone <jistone@redhat.com> - 1.31.0-4
+* Thu Dec 06 2018 Josh Stone <jistone@redhat.com> - 1.31.0-8
-- Backport fixes for rls.
-
-* Thu Dec 13 2018 Josh Stone <jistone@redhat.com> - 1.31.0-3
 - Update to 1.31.0 -- Rust 2018!
 - clippy/rls/rustfmt are no longer -preview
 
-* Wed Dec 12 2018 Josh Stone <jistone@redhat.com> - 1.30.1-2
+* Thu Nov 08 2018 Josh Stone <jistone@redhat.com> - 1.30.1-7
 - Update to 1.30.1.
 
-* Tue Nov 06 2018 Josh Stone <jistone@redhat.com> - 1.29.2-1
+* Thu Oct 25 2018 Josh Stone <jistone@redhat.com> - 1.30.0-6
+- Update to 1.30.0.
+
+* Mon Oct 22 2018 Josh Stone <jistone@redhat.com> - 1.29.2-5
+- Rebuild without bootstrap binaries.
+
+* Sat Oct 20 2018 Josh Stone <jistone@redhat.com> - 1.29.2-4
+- Re-bootstrap armv7hl due to rhbz#1639485
+
+* Fri Oct 12 2018 Josh Stone <jistone@redhat.com> - 1.29.2-3
 - Update to 1.29.2.
 
-* Thu Nov 01 2018 Josh Stone <jistone@redhat.com> - 1.28.0-1
+* Tue Sep 25 2018 Josh Stone <jistone@redhat.com> - 1.29.1-2
-- Update to 1.28.0.
+- Update to 1.29.1.
-
-* Thu Nov 01 2018 Josh Stone <jistone@redhat.com> - 1.27.2-1
-- Update to 1.27.2.
-
-* Wed Oct 10 2018 Josh Stone <jistone@redhat.com> - 1.26.2-12
-- Fix "fp" target feature for AArch64 (#1632880)
-
-* Mon Oct 08 2018 Josh Stone <jistone@redhat.com> - 1.26.2-11
 - Security fix for str::repeat (pending CVE).
 
-* Fri Oct 05 2018 Josh Stone <jistone@redhat.com> - 1.26.2-10
+* Thu Sep 13 2018 Josh Stone <jistone@redhat.com> - 1.29.0-1
+- Update to 1.29.0.
+- Add a clippy-preview subpackage
+
+* Mon Aug 13 2018 Josh Stone <jistone@redhat.com> - 1.28.0-3
+- Use llvm6.0 instead of llvm-7 for now
+
+* Tue Aug 07 2018 Josh Stone <jistone@redhat.com> - 1.28.0-2
+- Rebuild for LLVM ppc64/s390x fixes
+
+* Thu Aug 02 2018 Josh Stone <jistone@redhat.com> - 1.28.0-1
+- Update to 1.28.0.
+
+* Tue Jul 24 2018 Josh Stone <jistone@redhat.com> - 1.27.2-4
+- Update to 1.27.2.
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.27.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jul 10 2018 Josh Stone <jistone@redhat.com> - 1.27.1-2
+- Update to 1.27.1.
+- Security fix for CVE-2018-1000622
+
+* Thu Jun 21 2018 Josh Stone <jistone@redhat.com> - 1.27.0-1
+- Update to 1.27.0.
+
+* Tue Jun 05 2018 Josh Stone <jistone@redhat.com> - 1.26.2-4
 - Rebuild without bootstrap binaries.
 
-* Thu Oct 04 2018 Josh Stone <jistone@redhat.com> - 1.26.2-9
+* Tue Jun 05 2018 Josh Stone <jistone@redhat.com> - 1.26.2-3
-- Bootstrap without SCL packaging. (rhbz1635067)
-
-* Tue Aug 28 2018 Tom Stellard <tstellar@redhat.com> - 1.26.2-8
-- Use python3 prefix for lldb Requires
-
-* Mon Aug 13 2018 Josh Stone <jistone@redhat.com> - 1.26.2-7
-- Build with platform-python
-
-* Tue Aug 07 2018 Josh Stone <jistone@redhat.com> - 1.26.2-6
-- Exclude rust-src from auto-requires
-
-* Thu Aug 02 2018 Josh Stone <jistone@redhat.com> - 1.26.2-5
-- Rebuild without bootstrap binaries.
-
-* Tue Jul 31 2018 Josh Stone <jistone@redhat.com> - 1.26.2-4
-- Bootstrap as a module.
-
-* Mon Jun 04 2018 Josh Stone <jistone@redhat.com> - 1.26.2-3
 - Update to 1.26.2.
+- Re-bootstrap to deal with LLVM symbol changes.
 
-* Wed May 30 2018 Josh Stone <jistone@redhat.com> - 1.26.1-2
+* Tue May 29 2018 Josh Stone <jistone@redhat.com> - 1.26.1-2
 - Update to 1.26.1.
 
-* Fri May 18 2018 Josh Stone <jistone@redhat.com> - 1.26.0-1
+* Thu May 10 2018 Josh Stone <jistone@redhat.com> - 1.26.0-1
 - Update to 1.26.0.
 
+* Mon Apr 16 2018 Dan Callaghan <dcallagh@redhat.com> - 1.25.0-3
+- Add cargo, rls, and analysis
+
 * Tue Apr 10 2018 Josh Stone <jistone@redhat.com> - 1.25.0-2
 - Filter codegen-backends from Provides too.
 
-* Tue Apr 03 2018 Josh Stone <jistone@redhat.com> - 1.25.0-1
+* Thu Mar 29 2018 Josh Stone <jistone@redhat.com> - 1.25.0-1
 - Update to 1.25.0.
-- Add rustfmt-preview as a subpackage.
 
-* Thu Feb 22 2018 Josh Stone <jistone@redhat.com> - 1.24.0-1
+* Thu Mar 01 2018 Josh Stone <jistone@redhat.com> - 1.24.1-1
+- Update to 1.24.1.
+
+* Wed Feb 21 2018 Josh Stone <jistone@redhat.com> - 1.24.0-3
+- Backport a rebuild fix for rust#48308.
+
+* Mon Feb 19 2018 Josh Stone <jistone@redhat.com> - 1.24.0-2
+- rhbz1546541: drop full-bootstrap; cmp libs before symlinking.
+- Backport pr46592 to fix local_rebuild bootstrapping.
+- Backport pr48362 to fix relative/absolute libdir.
+
+* Thu Feb 15 2018 Josh Stone <jistone@redhat.com> - 1.24.0-1
 - Update to 1.24.0.
 
-* Tue Jan 16 2018 Josh Stone <jistone@redhat.com> - 1.23.0-2
+* Mon Feb 12 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.23.0-4
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Tue Feb 06 2018 Josh Stone <jistone@redhat.com> - 1.23.0-3
+- Use full-bootstrap to work around a rebuild issue.
+- Patch binaryen for GCC 8
+
+* Thu Feb 01 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.23.0-2
+- Switch to %%ldconfig_scriptlets
+
+* Mon Jan 08 2018 Josh Stone <jistone@redhat.com> - 1.23.0-1
+- Update to 1.23.0.
+
+* Thu Nov 23 2017 Josh Stone <jistone@redhat.com> - 1.22.1-1
+- Update to 1.22.1.
+
+* Thu Oct 12 2017 Josh Stone <jistone@redhat.com> - 1.21.0-1
+- Update to 1.21.0.
+
+* Mon Sep 11 2017 Josh Stone <jistone@redhat.com> - 1.20.0-2
+- ABI fixes for ppc64 and s390x.
+
+* Thu Aug 31 2017 Josh Stone <jistone@redhat.com> - 1.20.0-1
+- Update to 1.20.0.
+- Add a rust-src subpackage.
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Jul 24 2017 Josh Stone <jistone@redhat.com> - 1.19.0-2
+- Use find-debuginfo.sh --keep-section .rustc
+
+* Thu Jul 20 2017 Josh Stone <jistone@redhat.com> - 1.19.0-1
+- Update to 1.19.0.
+
+* Thu Jun 08 2017 Josh Stone <jistone@redhat.com> - 1.18.0-1
+- Update to 1.18.0.
+
+* Mon May 08 2017 Josh Stone <jistone@redhat.com> - 1.17.0-2
+- Move shared libraries back to libdir and symlink in rustlib
+
+* Thu Apr 27 2017 Josh Stone <jistone@redhat.com> - 1.17.0-1
+- Update to 1.17.0.
+
+* Mon Mar 20 2017 Josh Stone <jistone@redhat.com> - 1.16.0-3
+- Make rust-lldb arch-specific to deal with lldb deps
+
+* Fri Mar 17 2017 Josh Stone <jistone@redhat.com> - 1.16.0-2
+- Limit rust-lldb arches
+
+* Thu Mar 16 2017 Josh Stone <jistone@redhat.com> - 1.16.0-1
+- Update to 1.16.0.
+- Use rustbuild instead of the old makefiles.
+- Update bootstrapping to include rust-std and cargo.
+- Add a rust-lldb subpackage.
+
+* Thu Feb 09 2017 Josh Stone <jistone@redhat.com> - 1.15.1-1
+- Update to 1.15.1.
+- Require rust-rpm-macros for new crate packaging.
+- Keep shared libraries under rustlib/, only debug-stripped.
+- Merge and clean up conditionals for epel7.
+
+* Fri Dec 23 2016 Josh Stone <jistone@redhat.com> - 1.14.0-2
 - Rebuild without bootstrap binaries.
 
-* Mon Jan 15 2018 Josh Stone <jistone@redhat.com> - 1.23.0-1
+* Thu Dec 22 2016 Josh Stone <jistone@redhat.com> - 1.14.0-1
-- Bootstrap 1.23 on el8.
+- Update to 1.14.0.
+- Rewrite bootstrap logic to target specific arches.
+- Bootstrap ppc64, ppc64le, s390x. (thanks to Sinny Kumari for testing!)
+
+* Thu Nov 10 2016 Josh Stone <jistone@redhat.com> - 1.13.0-1
+- Update to 1.13.0.
+- Use hardening flags for linking.
+- Split the standard library into its own package
+- Centralize rustlib/ under /usr/lib/ for multilib integration.
+
+* Thu Oct 20 2016 Josh Stone <jistone@redhat.com> - 1.12.1-1
+- Update to 1.12.1.
+
+* Fri Oct 14 2016 Josh Stone <jistone@redhat.com> - 1.12.0-7
+- Rebuild with LLVM 3.9.
+- Add ncurses-devel for llvm-config's -ltinfo.
+
+* Thu Oct 13 2016 Josh Stone <jistone@redhat.com> - 1.12.0-6
+- Rebuild with llvm-static, preparing for 3.9
+
+* Fri Oct 07 2016 Josh Stone <jistone@redhat.com> - 1.12.0-5
+- Rebuild with fixed eu-strip (rhbz1380961)
+
+* Fri Oct 07 2016 Josh Stone <jistone@redhat.com> - 1.12.0-4
+- Rebuild without bootstrap binaries.
+
+* Thu Oct 06 2016 Josh Stone <jistone@redhat.com> - 1.12.0-3
+- Bootstrap aarch64.
+- Use jemalloc's MALLOC_CONF to work around #36944.
+- Apply pr36933 to really disable armv7hl NEON.
+
+* Sat Oct 01 2016 Josh Stone <jistone@redhat.com> - 1.12.0-2
+- Protect .rustc from rpm stripping.
+
+* Fri Sep 30 2016 Josh Stone <jistone@redhat.com> - 1.12.0-1
+- Update to 1.12.0.
+- Always use --local-rust-root, even for bootstrap binaries.
+- Remove the rebuild conditional - the build system now figures it out.
+- Let minidebuginfo do its thing, since metadata is no longer a note.
+- Let rust build its own compiler-rt builtins again.
+
+* Sat Sep 03 2016 Josh Stone <jistone@redhat.com> - 1.11.0-3
+- Rebuild without bootstrap binaries.
+
+* Fri Sep 02 2016 Josh Stone <jistone@redhat.com> - 1.11.0-2
+- Bootstrap armv7hl, with backported no-neon patch.
+
+* Wed Aug 24 2016 Josh Stone <jistone@redhat.com> - 1.11.0-1
+- Update to 1.11.0.
+- Drop the backported patches.
+- Patch get-stage0.py to trust existing bootstrap binaries.
+- Use libclang_rt.builtins from compiler-rt, dodging llvm-static issues.
+- Use --local-rust-root to make sure the right bootstrap is used.
+
+* Sat Aug 13 2016 Josh Stone <jistone@redhat.com> 1.10.0-4
+- Rebuild without bootstrap binaries.
+
+* Fri Aug 12 2016 Josh Stone <jistone@redhat.com> - 1.10.0-3
+- Initial import into Fedora (#1356907), bootstrapped
+- Format license text as suggested in review.
+- Note how the tests already run in parallel.
+- Undefine _include_minidebuginfo, because it duplicates ".note.rustc".
+- Don't let checks fail the whole build.
+- Note that -doc can't be noarch, as rpmdiff doesn't allow variations.
+
+* Tue Jul 26 2016 Josh Stone <jistone@redhat.com> - 1.10.0-2
+- Update -doc directory ownership, and mark its licenses.
+- Package and declare licenses for libbacktrace and hoedown.
+- Set bootstrap_base as a global.
+- Explicitly require python2.
+
+* Thu Jul 14 2016 Josh Stone <jistone@fedoraproject.org> - 1.10.0-1
+- Initial package, bootstrapped
+
+## END: Generated by rpmautospec