.gitignore

@@ -1,2 +1,2 @@
-SOURCES/rustc-1.88.0-src.tar.xz
-SOURCES/wasi-libc-640c0cfc19a96b099e0791824be5ef0105ce2084.tar.gz
+SOURCES/rustc-1.84.1-src.tar.xz
+SOURCES/wasi-libc-wasi-sdk-25.tar.gz

.rust.metadata

@@ -1,2 +1,2 @@
-a5772a6462f53ffc71fda030bece8442d1214198 SOURCES/rustc-1.88.0-src.tar.xz
-d6330f7ed84d311d1338796af7fd60f011f3a707 SOURCES/wasi-libc-640c0cfc19a96b099e0791824be5ef0105ce2084.tar.gz
+787899153e848b012d8bbd6ec0baf0ed5e189831 SOURCES/rustc-1.84.1-src.tar.xz
+c42dc30854ecbce5380304c38bd48b5911d1ce62 SOURCES/wasi-libc-wasi-sdk-25.tar.gz

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

@@ -0,0 +1,39 @@
+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 687112c89c9058ef1e79f1c3a974940b1ae43ea3 Mon Sep 17 00:00:00 2001
+From 3d8c6d095581e8d7585f3772cfd16f6367f3c008 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,7 +12,7 @@ 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 81b96cd39ffa..4c9916af826b 100644
+index f237391016e7..08bcd9699b4a 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 {
@@ -26,10 +26,10 @@ index 81b96cd39ffa..4c9916af826b 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 3b719ebaf07e..8b4fecee68f0 100644
+index 222d5651b521..4b780bc8a8e7 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 {
+@@ -14,7 +14,7 @@ pub fn target() -> Target {
      let opts = TargetOptions {
          abi: "softfloat".into(),
          linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
@@ -39,10 +39,10 @@ index 3b719ebaf07e..8b4fecee68f0 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 9656024ddaa1..2099fa17229f 100644
+index 429303170b6b..19d4ec53f6d8 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 {
+@@ -9,6 +9,7 @@ pub 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,23 +51,23 @@ index 9656024ddaa1..2099fa17229f 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 e14a36735894..b493d7d98b46 100644
+index 549706998d46..b7e9158ddef5 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 {
+@@ -17,7 +17,7 @@ pub 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 bce6aa0ebc6b..7fa1148a1de7 100644
+index 6da1fcca58c8..c84ae44576d4 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
-@@ -14,6 +14,7 @@ pub(crate) fn target() -> Target {
+@@ -16,6 +16,7 @@ pub fn target() -> Target {
      base.plt_by_default = false;
      base.max_atomic_width = Some(64);
      base.entry_abi = Conv::X86_64Win64;
@@ -76,5 +76,5 @@ index bce6aa0ebc6b..7fa1148a1de7 100644
      // 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.48.1
+2.46.0
 

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

@@ -1,22 +1,22 @@
-From e8833a9032b9f5773ef891b3f12b93322d6b4950 Mon Sep 17 00:00:00 2001
-From: Jesus Checa Hidalgo <jchecahi@redhat.com>
-Date: Mon, 7 Apr 2025 16:59:10 +0200
+From 8d4d52446347872816ab51958e9f3162cf722ee6 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
 
 ---
- bootstrap.example.toml                        | 5 +++++
+ config.example.toml                           | 5 +++++
  src/bootstrap/src/core/build_steps/compile.rs | 4 ++++
  src/bootstrap/src/core/config/config.rs       | 8 ++++++++
  src/bootstrap/src/lib.rs                      | 5 +++++
  4 files changed, 22 insertions(+)
 
-diff --git a/bootstrap.example.toml b/bootstrap.example.toml
-index 2a98821f225..580d6b2a8a2 100644
---- a/bootstrap.example.toml
-+++ b/bootstrap.example.toml
-@@ -948,6 +948,11 @@
- # This overrides the global `rust.jemalloc` option. See that option for more info.
- #jemalloc = rust.jemalloc (bool)
+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)
  
 +# Copy libc and CRT objects into the target lib/self-contained/ directory.
 +# Enabled by default on `musl`, `wasi`, and `windows-gnu` targets. Other
@@ -27,10 +27,10 @@ index 2a98821f225..580d6b2a8a2 100644
  # Distribution options
  #
 diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
-index 18b5d4426b1..3de9667123b 100644
+index 8e088682f92d..843b7123b120 100644
 --- a/src/bootstrap/src/core/build_steps/compile.rs
 +++ b/src/bootstrap/src/core/build_steps/compile.rs
-@@ -370,6 +370,10 @@ fn copy_self_contained_objects(
+@@ -346,6 +346,10 @@ fn copy_self_contained_objects(
      compiler: &Compiler,
      target: TargetSelection,
  ) -> Vec<(PathBuf, DependencyType)> {
@@ -42,18 +42,18 @@ index 18b5d4426b1..3de9667123b 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 bbb0fbfbb93..8642a86cbf8 100644
+index e706aba977b6..a55d98e94dd8 100644
 --- a/src/bootstrap/src/core/config/config.rs
 +++ b/src/bootstrap/src/core/config/config.rs
-@@ -666,6 +666,7 @@ pub struct Target {
+@@ -627,6 +627,7 @@ pub struct Target {
+     pub runner: Option<String>,
+     pub no_std: bool,
      pub codegen_backends: Option<Vec<String>>,
-     pub optimized_compiler_builtins: Option<bool>,
-     pub jemalloc: Option<bool>,
 +    pub self_contained: bool,
  }
  
  impl Target {
-@@ -677,6 +678,9 @@ pub fn from_triple(triple: &str) -> Self {
+@@ -638,6 +639,9 @@ pub fn from_triple(triple: &str) -> Self {
          if triple.contains("emscripten") {
              target.runner = Some("node".into());
          }
@@ -63,15 +63,15 @@ index bbb0fbfbb93..8642a86cbf8 100644
          target
      }
  }
-@@ -1292,6 +1296,7 @@ struct TomlTarget {
+@@ -1213,6 +1217,7 @@ struct TomlTarget {
+         no_std: Option<bool> = "no-std",
+         codegen_backends: Option<Vec<String>> = "codegen-backends",
          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> {
+@@ -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;
                  }
@@ -82,10 +82,10 @@ index bbb0fbfbb93..8642a86cbf8 100644
                  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 843d474f92d..3a4398ee1f8 100644
+index c384fd6bf435..a101c010b740 100644
 --- a/src/bootstrap/src/lib.rs
 +++ b/src/bootstrap/src/lib.rs
-@@ -1434,6 +1434,11 @@ fn no_std(&self, target: TargetSelection) -> Option<bool> {
+@@ -1351,6 +1351,11 @@ fn no_std(&self, target: TargetSelection) -> Option<bool> {
          self.config.target_config.get(&target).map(|t| t.no_std)
      }
  
@@ -98,5 +98,5 @@ index 843d474f92d..3a4398ee1f8 100644
      /// and `remote-test-server` binaries.
      fn remote_tested(&self, target: TargetSelection) -> bool {
 -- 
-2.48.1
+2.47.1
 

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

@@ -1,20 +1,19 @@
-From 35a37bd892939b8a1cd194632de3b9dd3a3d479b Mon Sep 17 00:00:00 2001
-From: Jesus Checa Hidalgo <jchecahi@redhat.com>
-Date: Mon, 7 Apr 2025 17:22:56 +0200
+From 21d53eca2af5f04c0aa6b898f99f58e0e093cfdd Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Thu, 28 Sep 2023 18:18:16 -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/json.rs                 |  2 ++
- compiler/rustc_target/src/spec/mod.rs                  |  2 ++
+ compiler/rustc_target/src/spec/mod.rs                  |  4 ++++
  .../rustc_target/src/spec/targets/wasm32_wasip1.rs     |  7 ++++---
- 4 files changed, 18 insertions(+), 3 deletions(-)
+ 3 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 b59d73a9aae..2369d73b4e3 100644
+index 5149e3a12f23..cf62fbdc7f59 100644
 --- a/compiler/rustc_codegen_ssa/src/back/link.rs
 +++ b/compiler/rustc_codegen_ssa/src/back/link.rs
-@@ -1583,6 +1583,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat
+@@ -1663,6 +1663,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat
              return file_path;
          }
      }
@@ -27,10 +26,10 @@ index b59d73a9aae..2369d73b4e3 100644
      for search_path in sess.target_filesearch().search_paths(PathKind::Native) {
          let file_path = search_path.dir.join(name);
          if file_path.exists() {
-@@ -2140,6 +2146,10 @@ fn add_library_search_dirs(
-         }
+@@ -2163,6 +2169,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()));
@@ -38,31 +37,11 @@ index b59d73a9aae..2369d73b4e3 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 4b6de5e18f5..373301d85ab 100644
---- a/compiler/rustc_target/src/spec/json.rs
-+++ b/compiler/rustc_target/src/spec/json.rs
-@@ -559,6 +559,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`
-@@ -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);
-+        target_option_val!(external_lib_path);
-         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");
 diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
-index 7234d1dc63e..3ec85bbf279 100644
+index 321ab40403a3..54791c8892d8 100644
 --- a/compiler/rustc_target/src/spec/mod.rs
 +++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -2301,6 +2301,7 @@ pub struct TargetOptions {
+@@ -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,
@@ -70,7 +49,7 @@ index 7234d1dc63e..3ec85bbf279 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,
-@@ -2821,6 +2822,7 @@ fn default() -> TargetOptions {
+@@ -2651,6 +2652,7 @@ fn default() -> TargetOptions {
              relro_level: RelroLevel::None,
              pre_link_objects: Default::default(),
              post_link_objects: Default::default(),
@@ -78,11 +57,27 @@ index 7234d1dc63e..3ec85bbf279 100644
              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 {
+         target_option_val!(linker_is_gnu_json, "linker-is-gnu");
+         target_option_val!(pre_link_objects);
+         target_option_val!(post_link_objects);
++        target_option_val!(external_lib_path);
+         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");
 diff --git a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
-index 26add451ed2..3eaf050e682 100644
+index 1cd30f21bec1..9a752d5712a6 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 {
+@@ -19,11 +19,12 @@ pub(crate) fn target() -> Target {
      options.env = "p1".into();
      options.add_pre_link_args(LinkerFlavor::WasmLld(Cc::Yes), &["--target=wasm32-wasip1"]);
  
@@ -99,5 +94,5 @@ index 26add451ed2..3eaf050e682 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.48.1
+2.47.1
 

SOURCES/macros.rust-toolset

@@ -29,12 +29,6 @@
 # -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:
@@ -42,8 +36,6 @@
   -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

@@ -1,79 +0,0 @@
-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.84.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	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

@@ -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	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.88.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	2025-06-13 15:47:08.609927319 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2025-06-13 15:47:54.463092386 -0700
-@@ -2530,7 +2530,6 @@ checksum = "e1a117465e7e1597e8febea8bb0c
- dependencies = [
-  "cc",
-  "libc",
-- "libssh2-sys",
-  "libz-sys",
-  "openssl-sys",
-  "pkg-config",
-@@ -2576,20 +2575,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-06-13 15:47:08.610402846 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2025-06-13 15:47:51.696071356 -0700
-@@ -46,7 +46,7 @@ curl = "0.4.47"
- curl-sys = "0.4.79"
- filetime = "0.2.25"
- flate2 = { version = "1.1.1", default-features = false, features = ["zlib-rs"] }
--git2 = "0.20.0"
-+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.71.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] }

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

SPECS/rust.spec

@@ -1,18 +1,8 @@
-## 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.88.0
-Release:        %autorelease
+Version:        1.84.1
+Release:        2%{?dist}
 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)
+License:        (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-DFS-2016)
 # ^ written as: (rust itself) and (bundled libraries)
 URL:            https://www.rust-lang.org
 
@@ -21,12 +11,12 @@ URL:            https://www.rust-lang.org
 %global rust_arches x86_64 i686 aarch64 ppc64le s390x
 ExclusiveArch:  %{rust_arches}
 
-# To bootstrap from scratch, set the channel and date from src/stage0
-# e.g. 1.88.0 wants rustc: 1.87.0-2025-05-15
+# To bootstrap from scratch, set the channel and date from src/stage0.json
+# e.g. 1.59.0 wants rustc: 1.58.0-2022-01-13
 # or nightly wants some beta-YYYY-MM-DD
-%global bootstrap_version 1.87.0
-%global bootstrap_channel 1.87.0
-%global bootstrap_date 2025-05-15
+%global bootstrap_version 1.83.0
+%global bootstrap_channel 1.83.0
+%global bootstrap_date 2024-11-28
 
 # Only the specified arches will use bootstrap binaries.
 # NOTE: Those binaries used to be uploaded with every new release, but that was
@@ -38,8 +28,7 @@ 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-25
-%global wasi_libc_ref 640c0cfc19a96b099e0791824be5ef0105ce2084
+%global wasi_libc_ref wasi-sdk-25
 %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}
@@ -53,19 +42,18 @@ ExclusiveArch:  %{rust_arches}
 %bcond_with llvm_static
 
 # 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 19.0.0
-%global bundled_llvm_version 20.1.5
-#global llvm_compat_version 19
+# is insufficient.  Rust currently requires LLVM 18.0+.
+%global min_llvm_version 18.0.0
+%global bundled_llvm_version 19.1.5
+#global llvm_compat_version 17
 %global llvm llvm%{?llvm_compat_version}
 %bcond_with bundled_llvm
 
-# Requires stable libgit2 1.9, and not the next minor soname change.
+# Requires stable libgit2 1.8, and not the next minor soname change.
 # 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.0
+%global min_libgit2_version 1.8.1
+%global next_libgit2_version 1.9.0~
+%global bundled_libgit2_version 1.8.1
 %if 0%{?fedora} >= 41
 %bcond_with bundled_libgit2
 %else
@@ -83,7 +71,7 @@ ExclusiveArch:  %{rust_arches}
 
 # Cargo uses UPSERTs with omitted conflict targets
 %global min_sqlite3_version 3.35
-%global bundled_sqlite3_version 3.49.1
+%global bundled_sqlite3_version 3.46.0
 %if 0%{?rhel} && 0%{?rhel} < 10
 %bcond_without bundled_sqlite3
 %else
@@ -124,7 +112,7 @@ ExclusiveArch:  %{rust_arches}
 # Detect non-stable channels from the version, like 1.74.0~beta.1
 %{lua: do
   local version = rpm.expand("%{version}")
-  local version_channel, subs = version:gsub("^.*~(%w+).*$", "%1", 1)
+  local version_channel, subs = string.gsub(version, "^.*~(%w+).*$", "%1", 1)
   rpm.define("channel " .. (subs ~= 0 and version_channel or "stable"))
   rpm.define("rustc_package rustc-" .. version_channel .. "-src")
 end}
@@ -149,11 +137,10 @@ 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.88.0-unbundle-sqlite.patch
+Patch6:         rustc-1.84.0-unbundle-sqlite.patch
 
-# Ensure stack in two places that affect s390x
-# https://github.com/rust-lang/rust/pull/142047
-Patch7:         rust-pr142047.patch
+# https://github.com/rust-lang/cc-rs/issues/1354
+Patch7:         0001-Only-translate-profile-flags-for-Clang.patch
 
 ### RHEL-specific patches below ###
 
@@ -163,7 +150,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.88.0-disable-libssh2.patch
+Patch100:       rustc-1.84.0-disable-libssh2.patch
 
 # Get the Rust triple for any architecture and ABI.
 %{lua: function rust_triple(arch, abi)
@@ -214,7 +201,7 @@ end}
 %endif
 %global all_targets %{?mingw_targets} %{?wasm_targets} %{?extra_targets}
 %define target_enabled() %{lua:
-  print(rpm.expand(" %{all_targets} "):find(rpm.expand(" %1 "), 1, true) or 0)
+  print(string.find(rpm.expand(" %{all_targets} "), rpm.expand(" %1 "), 1, true) or 0)
 }
 
 %if %defined bootstrap_arches
@@ -222,7 +209,7 @@ end}
 # Also define bootstrap_source just for the current target.
 %{lua: do
   local bootstrap_arches = {}
-  for arch in rpm.expand("%{bootstrap_arches}"):gmatch("%S+") do
+  for arch in string.gmatch(rpm.expand("%{bootstrap_arches}"), "%S+") do
     table.insert(bootstrap_arches, arch)
   end
   local base = rpm.expand("https://static.rust-lang.org/dist/%{bootstrap_date}")
@@ -254,8 +241,10 @@ BuildRequires:  (%{name} >= %{bootstrap_version} with %{name} <= %{version})
 %endif
 
 BuildRequires:  make
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
+BuildRequires:  gcc-toolset-14-annobin-plugin-gcc
+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
@@ -295,7 +284,6 @@ Provides:       bundled(llvm) = %{bundled_llvm_version}
 BuildRequires:  cmake >= 3.5.1
 %if %defined llvm_compat_version
 %global llvm_root %{_libdir}/%{llvm}
-%global llvm_path %{llvm_root}/bin
 %else
 %global llvm_root %{_prefix}
 %endif
@@ -311,10 +299,6 @@ 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
@@ -353,6 +337,12 @@ Requires:       /usr/bin/cc
 %global __brp_strip_static_archive %{nil}
 %global __brp_strip_lto %{nil}
 
+%if %{without bundled_llvm}
+%if "%{llvm_root}" == "%{_prefix}" || 0%{?scl:1}
+%global llvm_has_filecheck 1
+%endif
+%endif
+
 # We're going to override --libdir when configuring to get rustlib into a
 # common path, but we'll fix the shared libraries during install.
 %global common_libdir %{_prefix}/lib
@@ -371,11 +361,11 @@ BuildRequires:  mingw64-winpthreads-static
 
 %if %defined wasm_targets
 %if %with bundled_wasi_libc
-BuildRequires:  clang%{?llvm_compat_version}
+BuildRequires:  clang
 %else
 BuildRequires:  wasi-libc-static
 %endif
-BuildRequires:  lld%{?llvm_compat_version}
+BuildRequires:  lld
 %endif
 
 # For profiler_builtins
@@ -385,29 +375,6 @@ BuildRequires:  compiler-rt%{?llvm_compat_version}
 # https://github.com/rust-lang/rust/pull/101841
 Obsoletes:      %{name}-analysis < 1.69.0~
 
-# 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:) (       \
-  %{!-n:%{error:must specify a tool name}}    \
-  set -euo pipefail                           \
-  mkdir -p build/manifests/%{-n*}             \
-  %{shrink:                                   \
-    env RUSTC_BOOTSTRAP=1                     \
-      %{local_rust_root}/bin/cargo tree       \
-      --offline --edges normal,build          \
-      --prefix none --format "{p}"            \
-      %{-m:--manifest-path %{-m*}/Cargo.toml} \
-      %{-f:--features %{-f*}}                 \
-      %{-t:--target %{-t*}}                   \
-      %*                                      \
-    | sed '/([*/]/d; s/ (proc-macro)$//'      \
-    | sort -u                                 \
-    >build/manifests/%{-n*}/cargo-vendor.txt  \
-  }                                           \
-)
-%{?fedora:BuildRequires: cargo-rpm-macros}
-%{?rhel:BuildRequires: rust-toolset}
-
 %description
 Rust is a systems programming language that runs blazingly fast, prevents
 segfaults, and guarantees thread safety.
@@ -526,7 +493,7 @@ programs.
 Summary:        LLDB pretty printers for Rust
 BuildArch:      noarch
 Requires:       lldb
-Requires:       python3-lldb
+Requires:       python3.12-lldb
 Requires:       %{name}-debugger-common = %{version}-%{release}
 
 %description lldb
@@ -562,9 +529,8 @@ Provides:       bundled(sqlite) = %{bundled_sqlite3_version}
 %endif
 # For tests:
 BuildRequires:  git-core
-# Cargo is not much use without Rust, and it's worth keeping the versions
-# in sync since some feature development depends on them together.
-Requires:       %{name} = %{version}-%{release}
+# Cargo is not much use without Rust
+Requires:       %{name}
 
 # "cargo vendor" is a builtin command starting with 1.37.  The Obsoletes and
 # Provides are mostly relevant to RHEL, but harmless to have on Fedora/etc. too
@@ -682,7 +648,7 @@ rm -rf %{wasi_libc_dir}/dlmalloc/
 %if %without bundled_sqlite3
 %patch -P6 -p1
 %endif
-%patch -P7 -p1
+%patch -P7 -p1 -d vendor/cc-1.2.5
 
 %if %with disabled_libssh2
 %patch -P100 -p1
@@ -702,7 +668,7 @@ mkdir -p src/llvm-project/libunwind/
 # Remove submodules we don't need.
 rm -rf src/gcc
 rm -rf src/tools/enzyme
-rm -rf src/tools/rustc-perf/collector/*-benchmarks/
+rm -rf src/tools/rustc-perf
 
 # Remove other unused vendored libraries. This leaves the directory in place,
 # because some build scripts watch them, e.g. "cargo:rerun-if-changed=curl".
@@ -780,16 +746,15 @@ end}
   %{!?with_bundled_oniguruma:RUSTONIG_SYSTEM_LIBONIG=1}
   %{!?with_bundled_sqlite3:LIBSQLITE3_SYS_USE_PKG_CONFIG=1}
   %{!?with_disabled_libssh2:LIBSSH2_SYS_USE_PKG_CONFIG=1}
-  %{?llvm_path:PATH="%{llvm_path}:$PATH"}
 }
-%global export_rust_env export %{rust_env}
+%global export_rust_env export %{rust_env} ; source /opt/rh/gcc-toolset-14/enable
 
 %build
 %{export_rust_env}
 
 # Some builders have relatively little memory for their CPU count.
 # At least 4GB per CPU is a good rule of thumb for building rustc.
-%if %undefined constrain_build
+%if ! %defined constrain_build
 %define constrain_build(m:) %{lua:
   for l in io.lines('/proc/meminfo') do
     if l:sub(1, 9) == "MemTotal:" then
@@ -837,8 +802,12 @@ end}
 %endif
 
 # 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
+%if %defined llvm_compat_version
+# clang_resource_dir is not defined for compat builds.
+%define profiler /usr/lib/clang/%{llvm_compat_version}/lib/%{_arch}-redhat-linux-gnu/libclang_rt.profile.a
+%else
+%define profiler %{clang_resource_dir}/lib/%{_arch}-redhat-linux-gnu/libclang_rt.profile.a
+%endif
 test -r "%{profiler}"
 
 %configure --disable-option-checking \
@@ -857,6 +826,7 @@ test -r "%{profiler}"
   --local-rust-root=%{local_rust_root} \
   --set build.rustfmt=/bin/true \
   %{!?with_bundled_llvm: --llvm-root=%{llvm_root} \
+    %{!?llvm_has_filecheck: --disable-codegen-tests} \
     %{!?with_llvm_static: --enable-llvm-link-shared } } \
   --disable-llvm-static-stdcpp \
   --disable-llvm-bitcode-linker \
@@ -872,7 +842,7 @@ test -r "%{profiler}"
   --set build.optimized-compiler-builtins=false \
   --set rust.llvm-tools=false \
   --enable-extended \
-  --tools=cargo,clippy,rust-analyzer,rustfmt,src \
+  --tools=cargo,clippy,rls,rust-analyzer,rustfmt,src \
   --enable-vendor \
   --enable-verbose-tests \
   --release-channel=%{channel} \
@@ -880,25 +850,17 @@ test -r "%{profiler}"
 
 %global __x %{__python3} ./x.py
 
-# - 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" )
+%if %with rustc_pgo
 # Build the compiler with profile instrumentation
 %define profraw $PWD/build/profiles
 %define profdata $PWD/build/rustc.profdata
 mkdir -p "%{profraw}"
 %{__x} build sysroot --rust-profile-generate="%{profraw}"
 # Build cargo as a workload to generate compiler profiles
-# 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 \
-  RUSTC=$PWD/build/host/stage2/bin/rustc \
-  cargo build --manifest-path=src/tools/cargo/Cargo.toml
+  %{__x} --keep-stage=0 --keep-stage=1 build cargo
 # Finalize the profile data and clean up the raw files
-llvm-profdata merge -o "%{profdata}" "%{profraw}"
+%{llvm_root}/bin/llvm-profdata merge -o "%{profdata}" "%{profraw}"
 rm -r "%{profraw}" build/%{rust_triple}/stage2*/
 # Redefine the macro to use that profile data from now on
 %global __x %{__x} --rust-profile-use="%{profdata}"
@@ -915,21 +877,6 @@ for triple in %{?all_targets} ; do
   %{__x} build --target=$triple std
 done
 
-# 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}
-%{cargo_tree_manifest -n clippy -m src/tools/clippy}
-%{cargo_tree_manifest -n rust-analyzer -m src/tools/rust-analyzer}
-%{cargo_tree_manifest -n rustfmt -m src/tools/rustfmt}
-
-%{cargo_tree_manifest -n std -m library -f backtrace}
-for triple in %{?all_targets} ; do
-  case $triple in
-    *-none*) %{cargo_tree_manifest -n std-$triple -m library/alloc -t $triple} ;;
-    *) %{cargo_tree_manifest -n std-$triple -m library -f backtrace -t $triple} ;;
-  esac
-done
-
 %install
 %if 0%{?rhel} && 0%{?rhel} <= 9
 %{?set_build_flags}
@@ -942,6 +889,9 @@ for triple in %{?all_targets} ; do
   DESTDIR=%{buildroot} %{__x} install --target=$triple std
 done
 
+# The rls stub doesn't have an install target, but we can just copy it.
+%{__install} -t %{buildroot}%{_bindir} build/%{rust_triple}/stage2-tools-bin/rls
+
 # These are transient files used by x.py dist and install
 rm -rf ./build/dist/ ./build/tmp/
 
@@ -1042,21 +992,22 @@ 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.
-%{__x} test --no-fail-fast --skip={src/bootstrap,tests/crashes} || :
+timeout -v 90m %{__x} test --no-fail-fast --skip={src/bootstrap,tests/crashes} || :
 rm -rf "./build/%{rust_triple}/test/"
 
 %ifarch aarch64
 # https://github.com/rust-lang/rust/issues/123733
 %define cargo_test_skip --test-args "--skip panic_abort_doc_tests"
 %endif
-%{__x} test --no-fail-fast cargo %{?cargo_test_skip} || :
+timeout -v 30m %{__x} test --no-fail-fast cargo %{?cargo_test_skip} || :
 rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 
-%{__x} test --no-fail-fast clippy || :
+timeout -v 30m %{__x} test --no-fail-fast clippy || :
 
-%{__x} test --no-fail-fast rust-analyzer || :
+timeout -v 30m %{__x} test --no-fail-fast rust-analyzer || :
+
+timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 
-%{__x} test --no-fail-fast rustfmt || :
 
 %ldconfig_scriptlets
 
@@ -1070,9 +1021,6 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 %{_libexecdir}/rust-analyzer-proc-macro-srv
 %{_mandir}/man1/rustc.1*
 %{_mandir}/man1/rustdoc.1*
-%license build/manifests/rustc/cargo-vendor.txt
-%license %{_pkgdocdir}/COPYRIGHT.html
-%license %{_pkgdocdir}/licenses/
 
 
 %files std-static
@@ -1081,16 +1029,13 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 %dir %{rustlibdir}/%{rust_triple}/lib
 %{rustlibdir}/%{rust_triple}/lib/*.rlib
 %{rustlibdir}/%{rust_triple}/lib/*.so
-%license build/manifests/std/cargo-vendor.txt
-%license %{_pkgdocdir}/COPYRIGHT-library.html
 
 %global target_files()      \
 %files std-static-%1        \
 %dir %{rustlibdir}          \
 %dir %{rustlibdir}/%1       \
 %dir %{rustlibdir}/%1/lib   \
-%{rustlibdir}/%1/lib/*.rlib \
-%license build/manifests/std-%1/cargo-vendor.txt
+%{rustlibdir}/%1/lib/*.rlib
 
 %if %target_enabled i686-pc-windows-gnu
 %target_files i686-pc-windows-gnu
@@ -1172,7 +1117,6 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 %{_datadir}/zsh/site-functions/_cargo
 %dir %{_datadir}/cargo
 %dir %{_datadir}/cargo/registry
-%license build/manifests/cargo/cargo-vendor.txt
 
 
 %files -n rustfmt
@@ -1180,14 +1124,13 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 %{_bindir}/cargo-fmt
 %doc src/tools/rustfmt/{README,CHANGELOG,Configurations}.md
 %license src/tools/rustfmt/LICENSE-{APACHE,MIT}
-%license build/manifests/rustfmt/cargo-vendor.txt
 
 
 %files analyzer
+%{_bindir}/rls
 %{_bindir}/rust-analyzer
 %doc src/tools/rust-analyzer/README.md
 %license src/tools/rust-analyzer/LICENSE-{APACHE,MIT}
-%license build/manifests/rust-analyzer/cargo-vendor.txt
 
 
 %files -n clippy
@@ -1195,7 +1138,6 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 %{_bindir}/clippy-driver
 %doc src/tools/clippy/{README.md,CHANGELOG.md}
 %license src/tools/clippy/LICENSE-{APACHE,MIT}
-%license build/manifests/clippy/cargo-vendor.txt
 
 
 %files src
@@ -1212,21 +1154,8 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 
 
 %changelog
-## START: Generated by rpmautospec
-* Fri Jul 11 2025 Josh Stone <jistone@redhat.com> - 1.88.0-1
-- Update to Rust 1.88.0
-
-* Thu May 29 2025 Josh Stone <jistone@redhat.com> - 1.87.0-1
-- Update to 1.87.0
-
-* 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
-
-* Mon Mar 03 2025 Josh Stone <jistone@redhat.com> - 1.85.0-1
-- Update to 1.85.0
+* Mon Apr 28 2025 Josh Stone <jistone@redhat.com> - 1.84.1-2
+- Use python3.12 prefix for lldb Requires
 
 * Tue Feb 04 2025 Josh Stone <jistone@redhat.com> - 1.84.1-1
 - Update to 1.84.1
@@ -1250,31 +1179,23 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 * Tue Aug 13 2024 Josh Stone <jistone@redhat.com> - 1.79.0-2
 - Disable jump threading of float equality
 
-* Wed Jul 03 2024 Nikita Popov <npopov@redhat.com> - 1.79.0-1
+* Fri Jun 21 2024 Josh Stone <jistone@redhat.com> - 1.79.0-1
 - Update to 1.79.0
 
-* Tue Jun 18 2024 Nikita Popov <npopov@redhat.com> - 1.78.0-1
+* Fri Jun 21 2024 Josh Stone <jistone@redhat.com> - 1.78.0-1
 - Update to 1.78.0
+- Make std-static-wasm* noarch again
 
-* 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
+* Thu May 09 2024 Josh Stone <jistone@redhat.com> - 1.77.2-1
 - Update to 1.77.2.
 
-* Tue Apr 16 2024 Josh Stone <jistone@redhat.com> - 1.76.0-1
+* Wed Apr 17 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.
 
@@ -1300,14 +1221,14 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 * Tue Jul 18 2023 Josh Stone <jistone@redhat.com> - 1.70.0-1
 - Update to 1.70.0.
 
-* Wed May 10 2023 Josh Stone <jistone@redhat.com> - 1.69.0-1
+* Fri May 26 2023 Josh Stone <jistone@redhat.com> - 1.69.0-1
 - Update to 1.69.0.
 - Obsolete rust-analysis.
 
-* Tue May 09 2023 Josh Stone <jistone@redhat.com> - 1.68.2-1
+* Fri May 19 2023 Josh Stone <jistone@redhat.com> - 1.68.2-1
 - Update to 1.68.2.
 
-* Mon May 08 2023 Josh Stone <jistone@redhat.com> - 1.67.1-1
+* Thu May 18 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
@@ -1317,9 +1238,6 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 - 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.
@@ -1355,106 +1273,65 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 * Wed Dec 15 2021 Josh Stone <jistone@redhat.com> - 1.57.0-1
 - Update to 1.57.0.
 
-* Wed Dec 01 2021 Josh Stone <jistone@redhat.com> - 1.56.1-2
+* Thu Dec 02 2021 Josh Stone <jistone@redhat.com> - 1.56.1-2
 - Add rust-std-static-wasm32-wasi
-  Resolves: rhbz#1980082
+  Resolves: rhbz#1980080
 
-* Thu Nov 04 2021 Josh Stone <jistone@redhat.com> - 1.56.1-1
+* Tue Nov 02 2021 Josh Stone <jistone@redhat.com> - 1.56.0-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 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.54.0-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Tue Aug 17 2021 Josh Stone <jistone@redhat.com> - 1.54.0-2
+- Make std-static-wasm* arch-specific to avoid s390x.
 
-* Wed Aug 04 2021 Josh Stone <jistone@redhat.com> - 1.54.0-1
+* Thu Jul 29 2021 Josh Stone <jistone@redhat.com> - 1.54.0-1
 - Update to 1.54.0.
 
-* Tue Jun 22 2021 Josh Stone <jistone@redhat.com> - 1.53.0-1
+* Tue Jul 20 2021 Josh Stone <jistone@redhat.com> - 1.53.0-2
+- 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 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
+* Tue Jun 15 2021 Josh Stone <jistone@redhat.com> - 1.52.1-2
 - Set rust.codegen-units-std=1 for all targets again.
 - Add rust-std-static-wasm32-unknown-unknown.
 
-* 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
+* Tue May 25 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
 
-* Wed Apr 28 2021 Josh Stone <jistone@redhat.com> - 1.51.0-1
-- Update to 1.51.0. Includes security fixes for CVE-2021-28875
-  and CVE-2021-28877.
+* Mon May 24 2021 Josh Stone <jistone@redhat.com> - 1.51.0-1
+- Update to 1.51.0. Update to 1.51.0. Includes security fixes for
+  CVE-2021-28875 and CVE-2021-28877.
 
-* Tue Apr 27 2021 Josh Stone <jistone@redhat.com> - 1.50.0-1
+* Mon May 24 2021 Josh Stone <jistone@redhat.com> - 1.50.0-1
 - Update to 1.50.0.
 
-* 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
+* Wed Jan 13 2021 Josh Stone <jistone@redhat.com> - 1.49.0-1
 - Update to 1.49.0.
 
-* 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
+* Tue Jan 12 2021 Josh Stone <jistone@redhat.com> - 1.48.0-1
 - Update to 1.48.0.
 
-* 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
+* Thu Oct 22 2020 Josh Stone <jistone@redhat.com> - 1.47.0-1
 - Update to 1.47.0.
 
-* 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
+* Wed Oct 14 2020 Josh Stone <jistone@redhat.com> - 1.46.0-1
 - Update to 1.46.0.
 
-* Mon Aug 03 2020 Josh Stone <jistone@redhat.com> - 1.45.2-1
+* Tue Aug 04 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.
 
-* 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
+* Tue Jul 14 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.
 
@@ -1467,21 +1344,14 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 * 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-3
-- 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
+* Thu Jan 16 2020 Josh Stone <jistone@redhat.com> - 1.40.0-1
 - Update to 1.40.0.
+- Fix compiletest with newer (local-rebuild) libtest
+- Build compiletest with in-tree libtest
+- Fix ARM EHABI unwinding
 
 * Tue Nov 12 2019 Josh Stone <jistone@redhat.com> - 1.39.0-2
 - Fix a couple build and test issues with rustdoc.
@@ -1489,17 +1359,12 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 * 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.
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.36.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+- Disable libssh2 (git+ssh support).
 
 * Thu Jul 04 2019 Josh Stone <jistone@redhat.com> - 1.36.0-1
 - Update to 1.36.0.
@@ -1513,261 +1378,88 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 * Tue May 14 2019 Josh Stone <jistone@redhat.com> - 1.34.2-1
 - Update to 1.34.2 -- fixes CVE-2019-12083.
 
-* 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
+* Thu May 09 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.
 
-* 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
+* Wed Apr 10 2019 Josh Stone <jistone@redhat.com> - 1.33.0-1
 - Update to 1.33.0.
 
-* 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
+* Tue Apr 09 2019 Josh Stone <jistone@redhat.com> - 1.32.0-1
 - Update to 1.32.0.
 
-* Mon Jan 07 2019 Josh Stone <jistone@redhat.com> - 1.31.1-9
-- Update to 1.31.1 for RLS fixes.
+* Fri Dec 14 2018 Josh Stone <jistone@redhat.com> - 1.31.0-5
+- Restore rust-lldb.
 
-* Thu Dec 06 2018 Josh Stone <jistone@redhat.com> - 1.31.0-8
+* Thu Dec 13 2018 Josh Stone <jistone@redhat.com> - 1.31.0-4
+- 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
 
-* Thu Nov 08 2018 Josh Stone <jistone@redhat.com> - 1.30.1-7
+* Wed Dec 12 2018 Josh Stone <jistone@redhat.com> - 1.30.1-2
 - Update to 1.30.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
+* Tue Nov 06 2018 Josh Stone <jistone@redhat.com> - 1.29.2-1
 - Update to 1.29.2.
 
-* Tue Sep 25 2018 Josh Stone <jistone@redhat.com> - 1.29.1-2
-- Update to 1.29.1.
-- Security fix for str::repeat (pending CVE).
-
-* 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
+* Thu Nov 01 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
+* Thu Nov 01 2018 Josh Stone <jistone@redhat.com> - 1.27.2-1
 - 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
+* Wed Oct 10 2018 Josh Stone <jistone@redhat.com> - 1.26.2-12
+- Fix "fp" target feature for AArch64 (#1632880)
 
-* Tue Jul 10 2018 Josh Stone <jistone@redhat.com> - 1.27.1-2
-- Update to 1.27.1.
-- Security fix for CVE-2018-1000622
+* Mon Oct 08 2018 Josh Stone <jistone@redhat.com> - 1.26.2-11
+- Security fix for str::repeat (pending CVE).
 
-* 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
+* Fri Oct 05 2018 Josh Stone <jistone@redhat.com> - 1.26.2-10
 - Rebuild without bootstrap binaries.
 
-* Tue Jun 05 2018 Josh Stone <jistone@redhat.com> - 1.26.2-3
-- Update to 1.26.2.
-- Re-bootstrap to deal with LLVM symbol changes.
+* Thu Oct 04 2018 Josh Stone <jistone@redhat.com> - 1.26.2-9
+- Bootstrap without SCL packaging. (rhbz1635067)
 
-* Tue May 29 2018 Josh Stone <jistone@redhat.com> - 1.26.1-2
+* 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.
+
+* Wed May 30 2018 Josh Stone <jistone@redhat.com> - 1.26.1-2
 - Update to 1.26.1.
 
-* Thu May 10 2018 Josh Stone <jistone@redhat.com> - 1.26.0-1
+* Fri May 18 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.
 
-* Thu Mar 29 2018 Josh Stone <jistone@redhat.com> - 1.25.0-1
+* Tue Apr 03 2018 Josh Stone <jistone@redhat.com> - 1.25.0-1
 - Update to 1.25.0.
+- Add rustfmt-preview as a subpackage.
 
-* 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
+* Thu Feb 22 2018 Josh Stone <jistone@redhat.com> - 1.24.0-1
 - Update to 1.24.0.
 
-* 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
+* Tue Jan 16 2018 Josh Stone <jistone@redhat.com> - 1.23.0-2
 - Rebuild without bootstrap binaries.
 
-* Thu Dec 22 2016 Josh Stone <jistone@redhat.com> - 1.14.0-1
-- 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
+* Mon Jan 15 2018 Josh Stone <jistone@redhat.com> - 1.23.0-1
+- Bootstrap 1.23 on el8.