diff --git a/.gitignore b/.gitignore index 34be546..f8f9fde 100644 --- a/.gitignore +++ b/.gitignore @@ -375,88 +375,3 @@ /rust-1.55.0-s390x-unknown-linux-gnu.tar.xz /rust-1.55.0-x86_64-unknown-linux-gnu.tar.xz /rustc-1.56.1-src.tar.xz -/rustc-1.57.0-src.tar.xz -/wasi-libc-ad5133410f66b93a2381db5b542aad5e0964db96.tar.gz -/rust-1.56.1-aarch64-unknown-linux-gnu.tar.xz -/rust-1.56.1-armv7-unknown-linux-gnueabihf.tar.xz -/rust-1.56.1-i686-unknown-linux-gnu.tar.xz -/rust-1.56.1-powerpc64le-unknown-linux-gnu.tar.xz -/rust-1.56.1-s390x-unknown-linux-gnu.tar.xz -/rust-1.56.1-x86_64-unknown-linux-gnu.tar.xz -/rustc-1.58.0-src.tar.xz -/rust-1.57.0-aarch64-unknown-linux-gnu.tar.xz -/rust-1.57.0-armv7-unknown-linux-gnueabihf.tar.xz -/rust-1.57.0-i686-unknown-linux-gnu.tar.xz -/rust-1.57.0-powerpc64le-unknown-linux-gnu.tar.xz -/rust-1.57.0-s390x-unknown-linux-gnu.tar.xz -/rust-1.57.0-x86_64-unknown-linux-gnu.tar.xz -/rustc-1.58.1-src.tar.xz -/rustc-1.59.0-src.tar.xz -/rust-1.58.0-aarch64-unknown-linux-gnu.tar.xz -/rust-1.58.0-armv7-unknown-linux-gnueabihf.tar.xz -/rust-1.58.0-i686-unknown-linux-gnu.tar.xz -/rust-1.58.0-powerpc64le-unknown-linux-gnu.tar.xz -/rust-1.58.0-s390x-unknown-linux-gnu.tar.xz -/rust-1.58.0-x86_64-unknown-linux-gnu.tar.xz -/rustc-1.60.0-src.tar.xz -/rustc-1.61.0-src.tar.xz -/wasi-libc-9886d3d6200fcc3726329966860fc058707406cd.tar.gz -/rustc-1.62.0-src.tar.xz -/rustc-1.62.1-src.tar.xz -/rustc-1.63.0-src.tar.xz -/rustc-1.64.0-src.tar.xz -/rustc-1.65.0-src.tar.xz -/wasi-libc-wasi-sdk-16.tar.gz -/rustc-1.66.0-src.tar.xz -/wasi-libc-wasi-sdk-17.tar.gz -/rustc-1.66.1-src.tar.xz -/rustc-1.67.0-src.tar.xz -/rustc-1.67.1-src.tar.xz -/rustc-1.68.0-src.tar.xz -/wasi-libc-wasi-sdk-19.tar.gz -/rustc-1.68.1-src.tar.xz -/rustc-1.68.2-src.tar.xz -/rustc-1.69.0-src.tar.xz -/wasi-libc-1dfe5c302d1c5ab621f7abf04620fae92700fd22.tar.gz -/rustc-1.70.0-src.tar.xz -/wasi-libc-wasi-sdk-20.tar.gz -/rustc-1.71.0-src.tar.xz -/rustc-1.71.1-src.tar.xz -/rustc-1.72.0-src.tar.xz -/wasi-libc-7018e24d8fe248596819d2e884761676f3542a04.tar.gz -/rustc-1.72.1-src.tar.xz -/wasi-libc-bd950eb128bff337153de217b11270f948d04bb4.tar.gz -/rustc-1.73.0-src.tar.xz -/rustc-1.74.0-src.tar.xz -/rustc-1.74.1-src.tar.xz -/rustc-1.75.0-src.tar.xz -/rustc-1.76.0-src.tar.xz -/wasi-libc-03b228e46bb02fcc5927253e1b8ad715072b1ae4.tar.gz -/rustc-1.77.0-src.tar.xz -/rustc-1.77.2-src.tar.xz -/rustc-1.78.0-src.tar.xz -/rustc-1.79.0-src.tar.xz -/wasi-libc-wasi-sdk-22.tar.gz -/rustc-1.80.0-src.tar.xz -/rustc-1.80.1-src.tar.xz -/wasi-libc-3f43ea9abb24ed8d24d760989e1d87ea385f8eaa.tar.gz -/rustc-1.81.0-src.tar.xz -/wasi-libc-b9ef79d7dbd47c6c5bafdae760823467c2f60b70.tar.gz -/rustc-1.82.0-src.tar.xz -/wasi-libc-wasi-sdk-24.tar.gz -/rustc-1.83.0-src.tar.xz -/rustc-1.84.0-src.tar.xz -/wasi-libc-wasi-sdk-25.tar.gz -/rustc-1.84.1-src.tar.xz -/rustc-1.85.0-src.tar.xz -/rustc-1.85.1-src.tar.xz -/rustc-1.86.0-src.tar.xz -/wasi-libc-640c0cfc19a96b099e0791824be5ef0105ce2084.tar.gz -/rustc-1.87.0-src.tar.xz -/rustc-1.88.0-src.tar.xz -/wasi-libc-wasi-sdk-27.tar.gz -/rustc-1.89.0-src.tar.xz -/rustc-1.90.0-src.tar.xz -/rustc-1.91.0-src.tar.xz -/rustc-1.91.1-src.tar.xz -/rustc-1.92.0-src.tar.xz diff --git a/0001-Let-environment-variables-override-some-default-CPUs.patch b/0001-Let-environment-variables-override-some-default-CPUs.patch deleted file mode 100644 index fa654c6..0000000 --- a/0001-Let-environment-variables-override-some-default-CPUs.patch +++ /dev/null @@ -1,53 +0,0 @@ -From e54c0a4cc8bd8a76b155714b23a61d1d32a8d069 Mon Sep 17 00:00:00 2001 -From: Josh Stone -Date: Fri, 9 Jun 2023 15:23:08 -0700 -Subject: [PATCH] Let environment variables override some default CPUs - ---- - .../src/spec/targets/powerpc64le_unknown_linux_gnu.rs | 2 +- - .../rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs | 2 +- - .../rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs | 2 +- - 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 ---- 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 @@ - - pub(crate) fn target() -> Target { - let mut base = base::linux_gnu::opts(); -- base.cpu = "ppc64le".into(); -+ base.cpu = option_env!("RUSTC_TARGET_CPU_PPC64LE").unwrap_or("ppc64le").into(); - base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]); - 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 ---- 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 { - 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.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 ---- 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 @@ - - pub(crate) fn target() -> Target { - let mut base = base::linux_gnu::opts(); -- base.cpu = "x86-64".into(); -+ base.cpu = option_env!("RUSTC_TARGET_CPU_X86_64").unwrap_or("x86-64").into(); - base.plt_by_default = false; - base.max_atomic_width = Some(64); - base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]); --- -2.49.0 - diff --git a/0001-Use-lld-provided-by-system-for-wasm.patch b/0001-Use-lld-provided-by-system-for-wasm.patch new file mode 100644 index 0000000..681b21a --- /dev/null +++ b/0001-Use-lld-provided-by-system-for-wasm.patch @@ -0,0 +1,26 @@ +From 9ac837c237568a6c1c5f0e979fcce208cd9c926a Mon Sep 17 00:00:00 2001 +From: Ivan Mironov +Date: Sun, 8 Dec 2019 17:23:08 +0500 +Subject: [PATCH] Use lld provided by system for wasm + +--- + compiler/rustc_target/src/spec/wasm_base.rs | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/compiler/rustc_target/src/spec/wasm_base.rs b/compiler/rustc_target/src/spec/wasm_base.rs +index 4c954a1e567c..15c4f1bda5eb 100644 +--- a/compiler/rustc_target/src/spec/wasm_base.rs ++++ b/compiler/rustc_target/src/spec/wasm_base.rs +@@ -99,8 +99,7 @@ pub fn options() -> TargetOptions { + // arguments just yet + limit_rdylib_exports: false, + +- // we use the LLD shipped with the Rust toolchain by default +- linker: Some("rust-lld".to_owned()), ++ linker: Some("lld".to_owned()), + lld_flavor: LldFlavor::Wasm, + linker_is_gnu: false, + +-- +2.31.1 + diff --git a/0001-Use-lld-provided-by-system.patch b/0001-Use-lld-provided-by-system.patch deleted file mode 100644 index 522865f..0000000 --- a/0001-Use-lld-provided-by-system.patch +++ /dev/null @@ -1,80 +0,0 @@ -From e9405caf32dfb31bf17c3da0299df515a3755107 Mon Sep 17 00:00:00 2001 -From: Josh Stone -Date: Fri, 16 Aug 2024 10:12:58 -0700 -Subject: [PATCH] Use lld provided by system - ---- - compiler/rustc_target/src/spec/base/wasm.rs | 3 +-- - .../src/spec/targets/aarch64_unknown_none_softfloat.rs | 2 +- - compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs | 1 + - compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs | 2 +- - compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs | 1 + - 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 ---- 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 { - // threaded model which will legalize atomics to normal operations. - singlethread: true, - -- // we use the LLD shipped with the Rust toolchain by default -- linker: Some("rust-lld".into()), -+ linker: Some("lld".into()), - linker_flavor: LinkerFlavor::WasmLld(Cc::No), - - 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 ---- 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 { - let opts = TargetOptions { - abi: "softfloat".into(), - linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes), -- linker: Some("rust-lld".into()), -+ linker: Some("lld".into()), - features: "+v8a,+strict-align,-neon,-fp-armv8".into(), - 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 ---- 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 { - base.max_atomic_width = Some(128); - base.add_pre_link_args(LinkerFlavor::Msvc(Lld::No), &["/machine:arm64"]); - base.features = "+v8a".into(); -+ base.linker = Some("lld".into()); - - 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 ---- 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 { - 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, -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 ---- 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 { - base.plt_by_default = false; - base.max_atomic_width = Some(64); - base.entry_abi = CanonAbi::X86(X86Call::Win64); -+ base.linker = Some("lld".into()); - - // We disable MMX and SSE for now, even though UEFI allows using them. Problem is, you have to - // enable these CPU features explicitly before their first use, otherwise their instructions --- -2.51.0 - diff --git a/0001-bootstrap-allow-disabling-target-self-contained.patch b/0001-bootstrap-allow-disabling-target-self-contained.patch deleted file mode 100644 index 54ca101..0000000 --- a/0001-bootstrap-allow-disabling-target-self-contained.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 8364de4cb8edab85efcb895824ce06f4a95bd26f Mon Sep 17 00:00:00 2001 -From: Josh Stone -Date: Mon, 18 Aug 2025 17:11:07 -0700 -Subject: [PATCH] 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/toml/target.rs | 5 +++++ - src/bootstrap/src/lib.rs | 5 +++++ - 5 files changed, 23 insertions(+) - -diff --git a/bootstrap.example.toml b/bootstrap.example.toml -index 6f37e51a47d..ee21bc06bea 100644 ---- a/bootstrap.example.toml -+++ b/bootstrap.example.toml -@@ -1077,3 +1077,8 @@ - # pass `off`: - # - x86_64-unknown-linux-gnu - #default-linker-linux-override = "off" (for most targets) -+ -+# Copy libc and CRT objects into the target lib/self-contained/ directory. -+# Enabled by default on `musl`, `wasi`, and `windows-gnu` targets. Other -+# targets may ignore this setting if they have nothing to be contained. -+#self-contained = (bool) -diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs -index 6857a40ada8..9a98323a704 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( - compiler: &Compiler, - target: TargetSelection, - ) -> Vec<(PathBuf, DependencyType)> { -+ if builder.self_contained(target) != Some(true) { -+ return vec![]; -+ } -+ - let libdir_self_contained = - 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 ---- 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( - runner: target_runner, - optimized_compiler_builtins: target_optimized_compiler_builtins, - jemalloc: target_jemalloc, -+ self_contained: target_self_contained - } = cfg; - - let mut target = Target::from_triple(&triple); -@@ -921,6 +922,9 @@ pub(crate) fn parse_inner( - if let Some(s) = target_no_std { - target.no_std = s; - } -+ if let Some(s) = target_self_contained { -+ target.self_contained = s; -+ } - target.cc = target_cc.map(PathBuf::from); - target.cxx = target_cxx.map(PathBuf::from); - target.ar = target_ar.map(PathBuf::from); -diff --git a/src/bootstrap/src/core/config/toml/target.rs b/src/bootstrap/src/core/config/toml/target.rs -index 4c7afa50b96..83b8a1b50ca 100644 ---- a/src/bootstrap/src/core/config/toml/target.rs -+++ b/src/bootstrap/src/core/config/toml/target.rs -@@ -47,6 +47,7 @@ struct TomlTarget { - runner: Option = "runner", - optimized_compiler_builtins: Option = "optimized-compiler-builtins", - jemalloc: Option = "jemalloc", -+ self_contained: Option = "self-contained", - } - } - -@@ -80,6 +81,7 @@ pub struct Target { - pub codegen_backends: Option>, - pub optimized_compiler_builtins: Option, - pub jemalloc: Option, -+ pub self_contained: bool, - } - - impl Target { -@@ -91,6 +93,9 @@ pub fn from_triple(triple: &str) -> Self { - if triple.contains("emscripten") { - target.runner = Some("node".into()); - } -+ if triple.contains("-musl") || triple.contains("-wasi") || triple.contains("-windows-gnu") { -+ target.self_contained = true; -+ } - target - } - } -diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs -index dd30f05b728..cc89a84071e 100644 ---- a/src/bootstrap/src/lib.rs -+++ b/src/bootstrap/src/lib.rs -@@ -1441,6 +1441,11 @@ fn no_std(&self, target: TargetSelection) -> Option { - self.config.target_config.get(&target).map(|t| t.no_std) - } - -+ /// Returns `true` if this is a self-contained `target`, if defined -+ fn self_contained(&self, target: TargetSelection) -> Option { -+ self.config.target_config.get(&target).map(|t| t.self_contained) -+ } -+ - /// Returns `true` if the target will be tested using the `remote-test-client` - /// and `remote-test-server` binaries. - fn remote_tested(&self, target: TargetSelection) -> bool { --- -2.51.0 - diff --git a/0001-only-copy-rustlib-into-stage0-sysroot.patch b/0001-only-copy-rustlib-into-stage0-sysroot.patch deleted file mode 100644 index 6cf8aa9..0000000 --- a/0001-only-copy-rustlib-into-stage0-sysroot.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7d83bae4e2577ffa2afaf2fddb6948c1756a403c Mon Sep 17 00:00:00 2001 -From: Paul Murphy -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 - diff --git a/0002-set-an-external-library-path-for-wasm32-wasi.patch b/0002-set-an-external-library-path-for-wasm32-wasi.patch deleted file mode 100644 index 89b148f..0000000 --- a/0002-set-an-external-library-path-for-wasm32-wasi.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 862d09fe2e8b0f5ce8fe7bfc592cda66a1d74c08 Mon Sep 17 00:00:00 2001 -From: Josh Stone -Date: Mon, 18 Aug 2025 17:13:28 -0700 -Subject: [PATCH 2/2] set an external library path for wasm32-wasi - ---- - compiler/rustc_codegen_ssa/src/back/link.rs | 10 ++++++++++ - compiler/rustc_target/src/spec/json.rs | 4 ++++ - compiler/rustc_target/src/spec/mod.rs | 2 ++ - .../rustc_target/src/spec/targets/wasm32_wasip1.rs | 7 ++++--- - 4 files changed, 20 insertions(+), 3 deletions(-) - -diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs -index 48b01ea2df19..59b87396fed2 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 - return file_path; - } - } -+ if let Some(lib_path) = &sess.target.options.external_lib_path { -+ let file_path = Path::new(lib_path.as_ref()).join(name); -+ if file_path.exists() { -+ return file_path; -+ } -+ } - 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( - } - ControlFlow::<()>::Continue(()) - }); -+ -+ if let Some(lib_path) = &sess.target.options.external_lib_path { -+ cmd.include_path(Path::new(lib_path.as_ref())); -+ } - } - - /// 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 ---- a/compiler/rustc_target/src/spec/json.rs -+++ b/compiler/rustc_target/src/spec/json.rs -@@ -81,6 +81,7 @@ macro_rules! forward_opt { - forward!(linker_is_gnu_json); - forward!(pre_link_objects); - forward!(post_link_objects); -+ forward_opt!(external_lib_path); - forward!(pre_link_objects_self_contained); - forward!(post_link_objects_self_contained); - -@@ -301,6 +302,7 @@ macro_rules! target_option_val { - target_option_val!(linker_is_gnu_json, "linker-is-gnu"); - target_option_val!(pre_link_objects); - target_option_val!(post_link_objects); -+ 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"); -@@ -511,6 +513,8 @@ struct TargetSpecJson { - pre_link_objects: Option, - #[serde(rename = "post-link-objects")] - post_link_objects: Option, -+ #[serde(rename = "external-lib-path")] -+ external_lib_path: Option>, - #[serde(rename = "pre-link-objects-fallback")] - pre_link_objects_self_contained: Option, - #[serde(rename = "post-link-objects-fallback")] -diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs -index 07fb1ce63f7c..c076c2836f84 100644 ---- a/compiler/rustc_target/src/spec/mod.rs -+++ b/compiler/rustc_target/src/spec/mod.rs -@@ -1992,6 +1992,7 @@ pub struct TargetOptions { - /// Objects to link before and after all other object code. - pub pre_link_objects: CrtObjects, - pub post_link_objects: CrtObjects, -+ pub external_lib_path: Option>, - /// Same as `(pre|post)_link_objects`, but when self-contained linking mode is enabled. - pub pre_link_objects_self_contained: CrtObjects, - pub post_link_objects_self_contained: CrtObjects, -@@ -2518,6 +2519,7 @@ fn default() -> TargetOptions { - relro_level: RelroLevel::None, - pre_link_objects: Default::default(), - post_link_objects: Default::default(), -+ external_lib_path: None, - pre_link_objects_self_contained: Default::default(), - post_link_objects_self_contained: Default::default(), - link_self_contained: LinkSelfContainedDefault::False, -diff --git a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs -index 26add451ed25..3eaf050e6823 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 { - options.env = "p1".into(); - options.add_pre_link_args(LinkerFlavor::WasmLld(Cc::Yes), &["--target=wasm32-wasip1"]); - -- options.pre_link_objects_self_contained = crt_objects::pre_wasi_self_contained(); -- options.post_link_objects_self_contained = crt_objects::post_wasi_self_contained(); -+ options.pre_link_objects = crt_objects::pre_wasi_self_contained(); -+ options.post_link_objects = crt_objects::post_wasi_self_contained(); - - // FIXME: Figure out cases in which WASM needs to link with a native toolchain. -- options.link_self_contained = LinkSelfContainedDefault::True; -+ options.link_self_contained = LinkSelfContainedDefault::False; -+ options.external_lib_path = Some("/usr/wasm32-wasi/lib/wasm32-wasi".into()); - - // 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 - diff --git a/cargo_vendor.attr b/cargo_vendor.attr deleted file mode 100644 index be2d48f..0000000 --- a/cargo_vendor.attr +++ /dev/null @@ -1,2 +0,0 @@ -%__cargo_vendor_path ^%{_defaultlicensedir}(/[^/]+)+/cargo-vendor.txt$ -%__cargo_vendor_provides %{_rpmconfigdir}/cargo_vendor.prov diff --git a/cargo_vendor.prov b/cargo_vendor.prov deleted file mode 100755 index 6efca18..0000000 --- a/cargo_vendor.prov +++ /dev/null @@ -1,127 +0,0 @@ -#! /usr/bin/python3 -s -# Stripped down replacement for cargo2rpm parse-vendor-manifest - -import re -import subprocess -import sys -from typing import Optional - - -VERSION_REGEX = re.compile( - r""" - ^ - (?P0|[1-9]\d*) - \.(?P0|[1-9]\d*) - \.(?P0|[1-9]\d*) - (?:-(?P
(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?
-    (?:\+(?P[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$
-    """,
-    re.VERBOSE,
-)
-
-
-class Version:
-    """
-    Version that adheres to the "semantic versioning" format.
-    """
-
-    def __init__(self, major: int, minor: int, patch: int, pre: Optional[str] = None, build: Optional[str] = None):
-        self.major: int = major
-        self.minor: int = minor
-        self.patch: int = patch
-        self.pre: Optional[str] = pre
-        self.build: Optional[str] = build
-
-    @staticmethod
-    def parse(version: str) -> "Version":
-        """
-        Parses a version string and return a `Version` object.
-        Raises a `ValueError` if the string does not match the expected format.
-        """
-
-        match = VERSION_REGEX.match(version)
-        if not match:
-            raise ValueError(f"Invalid version: {version!r}")
-
-        matches = match.groupdict()
-
-        major_str = matches["major"]
-        minor_str = matches["minor"]
-        patch_str = matches["patch"]
-        pre = matches["pre"]
-        build = matches["build"]
-
-        major = int(major_str)
-        minor = int(minor_str)
-        patch = int(patch_str)
-
-        return Version(major, minor, patch, pre, build)
-
-    def to_rpm(self) -> str:
-        """
-        Formats the `Version` object as an equivalent RPM version string.
-        Characters that are invalid in RPM versions are replaced ("-" -> "_")
-
-        Build metadata (the optional `Version.build` attribute) is dropped, so
-        the conversion is not lossless for versions where this attribute is not
-        `None`. However, build metadata is not intended to be part of the
-        version (and is not even considered when doing version comparison), so
-        dropping it when converting to the RPM version format is correct.
-        """
-
-        s = f"{self.major}.{self.minor}.{self.patch}"
-        if self.pre:
-            s += f"~{self.pre.replace('-', '_')}"
-        return s
-
-
-def break_the_build(error: str):
-    """
-    This function writes a string that is an invalid RPM dependency specifier,
-    which causes dependency generators to fail and break the build. The
-    additional error message is printed to stderr.
-    """
-
-    print("*** FATAL ERROR ***")
-    print(error, file=sys.stderr)
-
- 
-def get_cargo_vendor_txt_paths_from_stdin() -> set[str]:  # pragma nocover
-    """
-    Read lines from standard input and filter out lines that look like paths
-    to `cargo-vendor.txt` files. This is how RPM generators pass lists of files.
-    """
-
-    lines = {line.rstrip("\n") for line in sys.stdin.readlines()}
-    return {line for line in lines if line.endswith("/cargo-vendor.txt")}
-
-
-def action_parse_vendor_manifest():
-    paths = get_cargo_vendor_txt_paths_from_stdin()
-
-    for path in paths:
-        with open(path) as file:
-            manifest = file.read()
-
-        for line in manifest.strip().splitlines():
-            crate, version = line.split(" v")
-            print(f"bundled(crate({crate})) = {Version.parse(version).to_rpm()}")
-
-
-def main():
-    try:
-        action_parse_vendor_manifest()
-        exit(0)
-
-    # print an error message that is not a valid RPM dependency
-    # to cause the generator to break the build
-    except (IOError, ValueError) as exc:
-        break_the_build(str(exc))
-        exit(1)
-
-    break_the_build("Uncaught exception: This should not happen, please report a bug.")
-    exit(1)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/changelog b/changelog
deleted file mode 100644
index 9048885..0000000
--- a/changelog
+++ /dev/null
@@ -1,607 +0,0 @@
-* Fri Apr 05 2024 Josh Stone  - 1.77.0-3
-- Ensure more consistency in PGO flags -- fixes Cargo tests
-
-* Thu Mar 21 2024 Davide Cavalca  - 1.77.0-2
-- Add build target for aarch64-unknown-none-softfloat
-
-* Thu Mar 21 2024 Nikita Popov  - 1.77.0-1
-- Update to 1.77.0
-
-* Thu Feb 08 2024 Josh Stone  - 1.76.0-1
-- Update to 1.76.0.
-
-* Tue Jan 30 2024 Josh Stone  - 1.75.0-3
-- Consolidate 32-bit build compromises.
-- Update rust-toolset and add rust-srpm-macros for ELN.
-
-* Fri Jan 26 2024 Fedora Release Engineering  - 1.75.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Dec 31 2023 Josh Stone  - 1.75.0-1
-- Update to 1.75.0.
-
-* Thu Dec 07 2023 Josh Stone  - 1.74.1-1
-- Update to 1.74.1.
-
-* Thu Nov 16 2023 Josh Stone  - 1.74.0-1
-- Update to 1.74.0.
-
-* Thu Oct 26 2023 Josh Stone  - 1.73.0-2
-- Use thin-LTO and PGO for rustc itself.
-
-* Thu Oct 05 2023 Josh Stone  - 1.73.0-1
-- Update to 1.73.0.
-- Drop el7 conditionals from the spec.
-
-* Fri Sep 29 2023 Josh Stone  - 1.72.1-3
-- Fix the profiler runtime with compiler-rt-17
-- Switch to unbundled wasi-libc on Fedora
-- Use emmalloc instead of CC0 dlmalloc when bundling wasi-libc
-
-* Mon Sep 25 2023 Josh Stone  - 1.72.1-2
-- Fix LLVM dependency for ELN
-- Add build target for x86_64-unknown-none
-- Add build target for x86_64-unknown-uefi
-
-* Tue Sep 19 2023 Josh Stone  - 1.72.1-1
-- Update to 1.72.1.
-- Migrated to SPDX license
-
-* Thu Aug 24 2023 Josh Stone  - 1.72.0-1
-- Update to 1.72.0.
-
-* Mon Aug 07 2023 Josh Stone  - 1.71.1-1
-- Update to 1.71.1.
-- Security fix for CVE-2023-38497
-
-* Tue Jul 25 2023 Josh Stone  - 1.71.0-3
-- Relax the suspicious_double_ref_op lint
-- Enable the profiler runtime for native hosts
-
-* Fri Jul 21 2023 Fedora Release Engineering  - 1.71.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Jul 17 2023 Josh Stone  - 1.71.0-1
-- Update to 1.71.0.
-
-* Fri Jun 23 2023 Josh Stone  - 1.70.0-2
-- Override default target CPUs to match distro settings
-
-* Thu Jun 01 2023 Josh Stone  - 1.70.0-1
-- Update to 1.70.0.
-
-* Fri May 05 2023 Josh Stone  - 1.69.0-3
-- Fix debuginfo with LLVM 16
-
-* Mon May 01 2023 Josh Stone  - 1.69.0-2
-- Build with LLVM 15 on Fedora 38+
-
-* Thu Apr 20 2023 Josh Stone  - 1.69.0-1
-- Update to 1.69.0.
-- Obsolete rust-analysis.
-
-* Tue Mar 28 2023 Josh Stone  - 1.68.2-1
-- Update to 1.68.2.
-
-* Thu Mar 23 2023 Josh Stone  - 1.68.1-1
-- Update to 1.68.1.
-
-* Thu Mar 09 2023 Josh Stone  - 1.68.0-1
-- Update to 1.68.0.
-
-* Tue Mar 07 2023 David Michael  - 1.67.1-3
-- Add a virtual Provides to rust-std-static containing the target triple.
-
-* Mon Feb 20 2023 Orion Poplawski  - 1.67.1-2
-- Ship rust-toolset for EPEL7
-
-* Thu Feb 09 2023 Josh Stone  - 1.67.1-1
-- Update to 1.67.1.
-
-* Fri Feb 03 2023 Josh Stone  - 1.67.0-3
-- Unbundle libgit2 on Fedora 38.
-
-* Fri Jan 27 2023 Adam Williamson  - 1.67.0-2
-- Backport PR #107360 to fix build of mesa
-- Backport 675fa0b3 to fix bootstrapping failure
-
-* Thu Jan 26 2023 Josh Stone  - 1.67.0-1
-- Update to 1.67.0.
-
-* Fri Jan 20 2023 Fedora Release Engineering  - 1.66.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Jan 10 2023 Josh Stone  - 1.66.1-1
-- Update to 1.66.1.
-- Security fix for CVE-2022-46176
-
-* Thu Dec 15 2022 Josh Stone  - 1.66.0-1
-- Update to 1.66.0.
-
-* Thu Nov 03 2022 Josh Stone  - 1.65.0-1
-- Update to 1.65.0.
-- rust-analyzer now obsoletes rls.
-
-* Thu Sep 22 2022 Josh Stone  - 1.64.0-1
-- Update to 1.64.0.
-- Add rust-analyzer.
-
-* Thu Aug 11 2022 Josh Stone  - 1.63.0-1
-- Update to 1.63.0.
-
-* Sat Jul 23 2022 Fedora Release Engineering  - 1.62.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Jul 19 2022 Josh Stone  - 1.62.1-1
-- Update to 1.62.1.
-
-* Wed Jul 13 2022 Josh Stone  - 1.62.0-2
-- Prevent unsound coercions from functions with opaque return types.
-
-* Thu Jun 30 2022 Josh Stone  - 1.62.0-1
-- Update to 1.62.0.
-
-* Mon May 23 2022 Josh Stone  - 1.61.0-2
-- Add missing target_feature to the list of well known cfg names
-
-* Thu May 19 2022 Josh Stone  - 1.61.0-1
-- Update to 1.61.0.
-- Add rust-toolset for ELN.
-
-* Thu Apr 07 2022 Josh Stone  - 1.60.0-1
-- Update to 1.60.0.
-
-* Fri Mar 25 2022 Josh Stone  - 1.59.0-4
-- Fix the archive index for wasm32-wasi's libc.a
-
-* Fri Mar 04 2022 Stephen Gallagher  - 1.59.0-3
-- Rebuild against the bootstrapped build
-
-* Fri Mar 04 2022 Stephen Gallagher  - 1.59.0-2.1
-- Bootstrapping for Fedora ELN
-
-* Tue Mar 01 2022 Josh Stone  - 1.59.0-2
-- Fix s390x hangs, rhbz#2058803
-
-* Thu Feb 24 2022 Josh Stone  - 1.59.0-1
-- Update to 1.59.0.
-- Revert to libgit2 1.3.x
-
-* Sun Feb 20 2022 Igor Raits  - 1.58.1-2
-- Rebuild for libgit2 1.4.x
-
-* Thu Jan 20 2022 Josh Stone  - 1.58.1-1
-- Update to 1.58.1.
-
-* Thu Jan 13 2022 Josh Stone  - 1.58.0-1
-- Update to 1.58.0.
-
-* Wed Jan 05 2022 Josh Stone  - 1.57.0-2
-- Add rust-std-static-i686-pc-windows-gnu
-- Add rust-std-static-x86_64-pc-windows-gnu
-
-* Thu Dec 02 2021 Josh Stone  - 1.57.0-1
-- Update to 1.57.0, fixes rhbz#2028675.
-- Backport rust#91070, fixes rhbz#1990657
-- Add rust-std-static-wasm32-wasi
-
-* Sun Nov 28 2021 Igor Raits  - 1.56.1-3
-- De-bootstrap (libgit2)
-
-* Sun Nov 28 2021 Igor Raits  - 1.56.1-2
-- Rebuild for libgit2 1.3.x
-
-* Mon Nov 01 2021 Josh Stone  - 1.56.1-1
-- Update to 1.56.1.
-
-* Thu Oct 21 2021 Josh Stone  - 1.56.0-1
-- Update to 1.56.0.
-
-* Tue Sep 14 2021 Sahana Prasad  - 1.55.0-2
-- Rebuilt with OpenSSL 3.0.0
-
-* Thu Sep 09 2021 Josh Stone  - 1.55.0-1
-- Update to 1.55.0.
-- Use llvm-ranlib for wasm rlibs; Fixes rhbz#2002612
-
-* Tue Aug 24 2021 Josh Stone  - 1.54.0-2
-- Build with LLVM 12 on Fedora 35+
-
-* Thu Jul 29 2021 Josh Stone  - 1.54.0-1
-- Update to 1.54.0.
-
-* Fri Jul 23 2021 Fedora Release Engineering  - 1.53.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jul 08 2021 Josh Stone  - 1.53.0-2
-- Exclude wasm on s390x for lack of lld
-
-* Thu Jun 17 2021 Josh Stone  - 1.53.0-1
-- Update to 1.53.0.
-
-* Wed Jun 02 2021 Josh Stone  - 1.52.1-2
-- Set rust.codegen-units-std=1 for all targets again.
-- Add rust-std-static-wasm32-unknown-unknown.
-- Rebuild f34 with LLVM 12.
-
-* Mon May 10 2021 Josh Stone  - 1.52.1-1
-- Update to 1.52.1.
-
-* Thu May 06 2021 Josh Stone  - 1.52.0-1
-- Update to 1.52.0.
-
-* Fri Apr 16 2021 Josh Stone  - 1.51.0-3
-- Security fixes for CVE-2020-36323, CVE-2021-31162
-
-* Wed Apr 14 2021 Josh Stone  - 1.51.0-2
-- Security fixes for CVE-2021-28876, CVE-2021-28878, CVE-2021-28879
-- Fix bootstrap for stage0 rust 1.51
-
-* Thu Mar 25 2021 Josh Stone  - 1.51.0-1
-- Update to 1.51.0.
-
-* Thu Feb 11 2021 Josh Stone  - 1.50.0-1
-- Update to 1.50.0.
-
-* Wed Jan 27 2021 Fedora Release Engineering  - 1.49.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jan 05 2021 Josh Stone  - 1.49.0-1
-- Update to 1.49.0.
-
-* Tue Dec 29 2020 Igor Raits  - 1.48.0-3
-- De-bootstrap
-
-* Mon Dec 28 2020 Igor Raits  - 1.48.0-2
-- Rebuild for libgit2 1.1.x
-
-* Thu Nov 19 2020 Josh Stone  - 1.48.0-1
-- Update to 1.48.0.
-
-* Sat Oct 10 2020 Jeff Law  - 1.47.0-2
-- Re-enable LTO
-
-* Thu Oct 08 2020 Josh Stone  - 1.47.0-1
-- Update to 1.47.0.
-
-* Fri Aug 28 2020 Fabio Valentini  - 1.46.0-2
-- Fix LTO with doctests (backported cargo PR#8657).
-
-* Thu Aug 27 2020 Josh Stone  - 1.46.0-1
-- Update to 1.46.0.
-
-* Mon Aug 03 2020 Josh Stone  - 1.45.2-1
-- Update to 1.45.2.
-
-* Thu Jul 30 2020 Josh Stone  - 1.45.1-1
-- Update to 1.45.1.
-
-* Wed Jul 29 2020 Fedora Release Engineering  - 1.45.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jul 16 2020 Josh Stone  - 1.45.0-1
-- Update to 1.45.0.
-
-* Wed Jul 01 2020 Jeff Law  - 1.44.1-2
-- Disable LTO
-
-* Thu Jun 18 2020 Josh Stone  - 1.44.1-1
-- Update to 1.44.1.
-
-* Thu Jun 04 2020 Josh Stone  - 1.44.0-1
-- Update to 1.44.0.
-
-* Thu May 07 2020 Josh Stone  - 1.43.1-1
-- Update to 1.43.1.
-
-* Thu Apr 23 2020 Josh Stone  - 1.43.0-1
-- Update to 1.43.0.
-
-* Thu Mar 12 2020 Josh Stone  - 1.42.0-1
-- Update to 1.42.0.
-
-* Thu Feb 27 2020 Josh Stone  - 1.41.1-1
-- Update to 1.41.1.
-
-* Thu Feb 20 2020 Josh Stone  - 1.41.0-2
-- Rebuild with llvm9.0
-
-* Thu Jan 30 2020 Josh Stone  - 1.41.0-1
-- Update to 1.41.0.
-
-* Thu Jan 16 2020 Josh Stone  - 1.40.0-3
-- Build compiletest with in-tree libtest
-
-* Tue Jan 07 2020 Josh Stone  - 1.40.0-2
-- Fix compiletest with newer (local-rebuild) libtest
-- Fix ARM EHABI unwinding
-
-* Thu Dec 19 2019 Josh Stone  - 1.40.0-1
-- Update to 1.40.0.
-
-* Tue Nov 12 2019 Josh Stone  - 1.39.0-2
-- Fix a couple build and test issues with rustdoc.
-
-* Thu Nov 07 2019 Josh Stone  - 1.39.0-1
-- Update to 1.39.0.
-
-* Fri Sep 27 2019 Josh Stone  - 1.38.0-2
-- Filter the libraries included in rust-std (rhbz1756487)
-
-* Thu Sep 26 2019 Josh Stone  - 1.38.0-1
-- Update to 1.38.0.
-
-* Thu Aug 15 2019 Josh Stone  - 1.37.0-1
-- Update to 1.37.0.
-
-* Fri Jul 26 2019 Fedora Release Engineering  - 1.36.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jul 04 2019 Josh Stone  - 1.36.0-1
-- Update to 1.36.0.
-
-* Wed May 29 2019 Josh Stone  - 1.35.0-2
-- Fix compiletest for rebuild testing.
-
-* Thu May 23 2019 Josh Stone  - 1.35.0-1
-- Update to 1.35.0.
-
-* Tue May 14 2019 Josh Stone  - 1.34.2-1
-- Update to 1.34.2 -- fixes CVE-2019-12083.
-
-* Tue Apr 30 2019 Josh Stone  - 1.34.1-3
-- Set rust.codegen-units-std=1
-
-* Fri Apr 26 2019 Josh Stone  - 1.34.1-2
-- Remove the ThinLTO workaround.
-
-* Thu Apr 25 2019 Josh Stone  - 1.34.1-1
-- Update to 1.34.1.
-- Add a ThinLTO fix for rhbz1701339.
-
-* Thu Apr 11 2019 Josh Stone  - 1.34.0-1
-- Update to 1.34.0.
-
-* Fri Mar 01 2019 Josh Stone  - 1.33.0-2
-- Fix deprecations for self-rebuild
-
-* Thu Feb 28 2019 Josh Stone  - 1.33.0-1
-- Update to 1.33.0.
-
-* Sat Feb 02 2019 Fedora Release Engineering  - 1.32.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jan 17 2019 Josh Stone  - 1.32.0-1
-- Update to 1.32.0.
-
-* Mon Jan 07 2019 Josh Stone  - 1.31.1-9
-- Update to 1.31.1 for RLS fixes.
-
-* Thu Dec 06 2018 Josh Stone  - 1.31.0-8
-- Update to 1.31.0 -- Rust 2018!
-- clippy/rls/rustfmt are no longer -preview
-
-* Thu Nov 08 2018 Josh Stone  - 1.30.1-7
-- Update to 1.30.1.
-
-* Thu Oct 25 2018 Josh Stone  - 1.30.0-6
-- Update to 1.30.0.
-
-* Mon Oct 22 2018 Josh Stone  - 1.29.2-5
-- Rebuild without bootstrap binaries.
-
-* Sat Oct 20 2018 Josh Stone  - 1.29.2-4
-- Re-bootstrap armv7hl due to rhbz#1639485
-
-* Fri Oct 12 2018 Josh Stone  - 1.29.2-3
-- Update to 1.29.2.
-
-* Tue Sep 25 2018 Josh Stone  - 1.29.1-2
-- Update to 1.29.1.
-- Security fix for str::repeat (pending CVE).
-
-* Thu Sep 13 2018 Josh Stone  - 1.29.0-1
-- Update to 1.29.0.
-- Add a clippy-preview subpackage
-
-* Mon Aug 13 2018 Josh Stone  - 1.28.0-3
-- Use llvm6.0 instead of llvm-7 for now
-
-* Tue Aug 07 2018 Josh Stone  - 1.28.0-2
-- Rebuild for LLVM ppc64/s390x fixes
-
-* Thu Aug 02 2018 Josh Stone  - 1.28.0-1
-- Update to 1.28.0.
-
-* Tue Jul 24 2018 Josh Stone  - 1.27.2-4
-- Update to 1.27.2.
-
-* Sat Jul 14 2018 Fedora Release Engineering  - 1.27.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jul 10 2018 Josh Stone  - 1.27.1-2
-- Update to 1.27.1.
-- Security fix for CVE-2018-1000622
-
-* Thu Jun 21 2018 Josh Stone  - 1.27.0-1
-- Update to 1.27.0.
-
-* Tue Jun 05 2018 Josh Stone  - 1.26.2-4
-- Rebuild without bootstrap binaries.
-
-* Tue Jun 05 2018 Josh Stone  - 1.26.2-3
-- Update to 1.26.2.
-- Re-bootstrap to deal with LLVM symbol changes.
-
-* Tue May 29 2018 Josh Stone  - 1.26.1-2
-- Update to 1.26.1.
-
-* Thu May 10 2018 Josh Stone  - 1.26.0-1
-- Update to 1.26.0.
-
-* Mon Apr 16 2018 Dan Callaghan  - 1.25.0-3
-- Add cargo, rls, and analysis
-
-* Tue Apr 10 2018 Josh Stone  - 1.25.0-2
-- Filter codegen-backends from Provides too.
-
-* Thu Mar 29 2018 Josh Stone  - 1.25.0-1
-- Update to 1.25.0.
-
-* Thu Mar 01 2018 Josh Stone  - 1.24.1-1
-- Update to 1.24.1.
-
-* Wed Feb 21 2018 Josh Stone  - 1.24.0-3
-- Backport a rebuild fix for rust#48308.
-
-* Mon Feb 19 2018 Josh Stone  - 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  - 1.24.0-1
-- Update to 1.24.0.
-
-* Mon Feb 12 2018 Iryna Shcherbina  - 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  - 1.23.0-3
-- Use full-bootstrap to work around a rebuild issue.
-- Patch binaryen for GCC 8
-
-* Thu Feb 01 2018 Igor Gnatenko  - 1.23.0-2
-- Switch to %%ldconfig_scriptlets
-
-* Mon Jan 08 2018 Josh Stone  - 1.23.0-1
-- Update to 1.23.0.
-
-* Thu Nov 23 2017 Josh Stone  - 1.22.1-1
-- Update to 1.22.1.
-
-* Thu Oct 12 2017 Josh Stone  - 1.21.0-1
-- Update to 1.21.0.
-
-* Mon Sep 11 2017 Josh Stone  - 1.20.0-2
-- ABI fixes for ppc64 and s390x.
-
-* Thu Aug 31 2017 Josh Stone  - 1.20.0-1
-- Update to 1.20.0.
-- Add a rust-src subpackage.
-
-* Thu Aug 03 2017 Fedora Release Engineering  - 1.19.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering  - 1.19.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon Jul 24 2017 Josh Stone  - 1.19.0-2
-- Use find-debuginfo.sh --keep-section .rustc
-
-* Thu Jul 20 2017 Josh Stone  - 1.19.0-1
-- Update to 1.19.0.
-
-* Thu Jun 08 2017 Josh Stone  - 1.18.0-1
-- Update to 1.18.0.
-
-* Mon May 08 2017 Josh Stone  - 1.17.0-2
-- Move shared libraries back to libdir and symlink in rustlib
-
-* Thu Apr 27 2017 Josh Stone  - 1.17.0-1
-- Update to 1.17.0.
-
-* Mon Mar 20 2017 Josh Stone  - 1.16.0-3
-- Make rust-lldb arch-specific to deal with lldb deps
-
-* Fri Mar 17 2017 Josh Stone  - 1.16.0-2
-- Limit rust-lldb arches
-
-* Thu Mar 16 2017 Josh Stone  - 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  - 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  - 1.14.0-2
-- Rebuild without bootstrap binaries.
-
-* Thu Dec 22 2016 Josh Stone  - 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  - 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  - 1.12.1-1
-- Update to 1.12.1.
-
-* Fri Oct 14 2016 Josh Stone  - 1.12.0-7
-- Rebuild with LLVM 3.9.
-- Add ncurses-devel for llvm-config's -ltinfo.
-
-* Thu Oct 13 2016 Josh Stone  - 1.12.0-6
-- Rebuild with llvm-static, preparing for 3.9
-
-* Fri Oct 07 2016 Josh Stone  - 1.12.0-5
-- Rebuild with fixed eu-strip (rhbz1380961)
-
-* Fri Oct 07 2016 Josh Stone  - 1.12.0-4
-- Rebuild without bootstrap binaries.
-
-* Thu Oct 06 2016 Josh Stone  - 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  - 1.12.0-2
-- Protect .rustc from rpm stripping.
-
-* Fri Sep 30 2016 Josh Stone  - 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  - 1.11.0-3
-- Rebuild without bootstrap binaries.
-
-* Fri Sep 02 2016 Josh Stone  - 1.11.0-2
-- Bootstrap armv7hl, with backported no-neon patch.
-
-* Wed Aug 24 2016 Josh Stone  - 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  1.10.0-4
-- Rebuild without bootstrap binaries.
-
-* Fri Aug 12 2016 Josh Stone  - 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  - 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  - 1.10.0-1
-- Initial package, bootstrapped
diff --git a/macros.rust-srpm b/macros.rust-srpm
deleted file mode 100644
index 45287a8..0000000
--- a/macros.rust-srpm
+++ /dev/null
@@ -1,62 +0,0 @@
-# rust_arches: list of architectures where building Rust is supported
-#
-# Since RPM itself now depends on Rust code (via its GPG backend, rpm-sequoia),
-# this list will probably always be a superset of all architectures that are
-# supported by Fedora, which is why it is no longer required to set
-# "ExclusiveArch: rust_arches" for Rust packages in Fedora.
-%rust_arches x86_64 %{ix86} armv7hl aarch64 ppc64 ppc64le riscv64 s390x
-
-# version_no_tilde: lua macro for reconstructing the original crate version
-#       from the RPM version (i.e. replace any "~" characters with "-")
-%version_no_tilde() %{lua:
-    local sep = rpm.expand('%1')
-    local ver = rpm.expand('%2')
-\
-    if sep == '%1' then
-        sep = '-'
-    end
-\
-    if ver == '%2' then
-        ver = rpm.expand('%version')
-    end
-    ver = ver:gsub('~', sep)
-\
-    print(ver)
-}
-
-# __crates_url: default API endpoint for downloading .crate files from crates.io
-%__crates_url https://crates.io/api/v1/crates/
-
-# crates_source: lua macro for constructing the Source URL for a crate
-%crates_source() %{lua:
-    local crate = rpm.expand('%1')
-    local version = rpm.expand('%2')
-    local url = rpm.expand('%__crates_url')
-\
-    -- first argument missing: fall back to %crate
-    if crate == '%1' then
-        crate = rpm.expand('%crate')
-    end
-    -- %crate macro not defined: fall back to %name
-    if crate == '%crate' then
-        crate = rpm.expand('%name')
-    end
-\
-    -- second argument missing: fall back to %crate_version
-    if version == '%2' then
-        version = rpm.expand('%crate_version')
-    end
-    -- %crate_version macro not defined: fall back to %version
-    if version == '%crate_version' then
-        version = rpm.expand('%version')
-    end
-    -- replace '~' with '-' for backwards compatibility
-    -- can be removed in the future
-    version = version:gsub('~', '-')
-\
-    print(url .. crate .. '/' .. version .. '/download#/' .. crate .. '-' .. version .. '.crate')
-}
-
-# __cargo_skip_build: unused macro, set to 0 for backwards compatibility
-%__cargo_skip_build 0
-
diff --git a/macros.rust-toolset b/macros.rust-toolset
deleted file mode 100644
index 135b3e2..0000000
--- a/macros.rust-toolset
+++ /dev/null
@@ -1,256 +0,0 @@
-# __rustc: path to the default rustc executable
-%__rustc /usr/bin/rustc
-
-# __rustdoc: path to the default rustdoc executable
-%__rustdoc /usr/bin/rustdoc
-
-# rustflags_opt_level: default optimization level
-#
-# It corresponds to the "-Copt-level" rustc command line option.
-%rustflags_opt_level 3
-
-# rustflags_debuginfo: default verbosity of debug information
-#
-# It corresponds to the "-Cdebuginfo" rustc command line option.
-# In some cases, it might be required to override this macro with "1" or even
-# "0", if memory usage gets too high during builds on some resource-constrained
-# architectures (most likely on 32-bit architectures), which will however
-# reduce the quality of the produced debug symbols.
-%rustflags_debuginfo 2
-
-# rustflags_codegen_units: default number of parallel code generation units
-#
-# The default value of "1" results in generation of better code, but comes at
-# the cost of longer build times.
-%rustflags_codegen_units 1
-
-# build_rustflags: default compiler flags for rustc (RUSTFLAGS)
-#
-# -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:
-  -Copt-level=%rustflags_opt_level
-  -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
-#
-# CARGO_HOME: This ensures cargo reads configuration file from .cargo/config.toml,
-#       and prevents writing any files to $HOME during RPM builds.
-%__cargo /usr/bin/env CARGO_HOME=.cargo RUSTFLAGS='%{build_rustflags}' /usr/bin/cargo
-
-# __cargo_common_opts: common command line flags for cargo
-#
-# _smp_mflags: run builds and tests in parallel
-%__cargo_common_opts %{?_smp_mflags}
-
-# cargo_prep: macro to set up build environment for cargo projects
-#
-# This involves four steps:
-# - create the ".cargo" directory if it doesn't exist yet
-# - dump custom cargo configuration into ".cargo/config.toml"
-# - remove "Cargo.lock" if it exists (it breaks builds with custom cargo config)
-# - remove "Cargo.toml.orig" if it exists (it breaks running "cargo package")
-#
-# Options:
-#   -V     - unpack and use vendored sources from Source tarball
-#                    (deprecated; use -v instead)
-#   -v  - use vendored sources from 
-#   -N             - Don't set up any registry. Only set up the build configuration.
-%cargo_prep(V:v:N)\
-%{-v:%{-V:%{error:-v and -V are mutually exclusive!}}}\
-%{-v:%{-N:%{error:-v and -N are mutually exclusive!}}}\
-(\
-set -euo pipefail\
-%{__mkdir} -p target/rpm\
-/usr/bin/ln -s rpm target/release\
-%{__rm} -rf .cargo/\
-%{__mkdir} -p .cargo\
-cat > .cargo/config.toml << EOF\
-[build]\
-rustc = "%{__rustc}"\
-rustdoc = "%{__rustdoc}"\
-\
-[profile.rpm]\
-inherits = "release"\
-opt-level = %{rustflags_opt_level}\
-codegen-units = %{rustflags_codegen_units}\
-debug = %{rustflags_debuginfo}\
-strip = "none"\
-\
-[env]\
-CFLAGS = "%{build_cflags}"\
-CXXFLAGS = "%{build_cxxflags}"\
-LDFLAGS = "%{build_ldflags}"\
-\
-[install]\
-root = "%{buildroot}%{_prefix}"\
-\
-[term]\
-verbose = true\
-EOF\
-%{-V:%{__tar} -xoaf %{S:%{-V*}}}\
-%{!?-N:\
-cat >> .cargo/config.toml << EOF\
-[source.vendored-sources]\
-directory = "%{-v*}%{-V:./vendor}"\
-\
-[source.crates-io]\
-registry = "https://crates.io"\
-replace-with = "vendored-sources"\
-EOF}\
-%{__rm} -f Cargo.toml.orig\
-)
-
-# __cargo_parse_opts: function-like macro which parses common flags into the
-#       equivalent command-line flags for cargo
-%__cargo_parse_opts(naf:) %{shrink:\
-    %{-n:%{-a:%{error:Can't specify both -n and -a}}}           \
-    %{-f:%{-a:%{error:Can't specify both -f(%{-f*}) and -a}}}   \
-    %{-n:--no-default-features}                                 \
-    %{-a:--all-features}                                        \
-    %{-f:--features %{-f*}}                                     \
-    %{nil}                                                      \
-}
-
-# cargo_build: builds the crate with cargo with the specified feature flags
-%cargo_build(naf:)\
-%{shrink:                                               \
-    %{__cargo} build                                    \
-    %{__cargo_common_opts}                              \
-    --profile rpm                                       \
-    %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}    \
-    %*                                                  \
-}
-
-# cargo_test: runs the test suite with cargo with the specified feature flags
-#
-# To pass command-line arguments to the cargo test runners directly (for
-# example, to skip certain tests during package builds), both the cargo_test
-# macro argument parsing and "cargo test" argument parsing need to be bypassed,
-# i.e. "%%cargo_test -- -- --skip foo" for skipping all tests with names that
-# match "foo".
-%cargo_test(naf:)\
-%{shrink:                                               \
-    %{__cargo} test                                     \
-    %{__cargo_common_opts}                              \
-    --profile rpm                                       \
-    --no-fail-fast                                      \
-    %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}    \
-    %*                                                  \
-}
-
-# cargo_install: install files into the buildroot
-#
-# For "binary" crates, this macro installs all "bin" build targets to _bindir
-# inside the buildroot. The "--no-track" option prevents the creation of the
-# "$CARGO_HOME/.crates.toml" file, which is used to keep track of which version
-# of a specific binary has been installed, but which conflicts between builds
-# of different Rust applications and is not needed when building RPM packages.
-%cargo_install(t:naf:)\
-(\
-set -euo pipefail                                                   \
-  %{shrink:                                                         \
-    %{__cargo} install                                              \
-      %{__cargo_common_opts}                                        \
-      --profile rpm                                                 \
-      --no-track                                                    \
-      --path .                                                      \
-      %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}              \
-      %*                                                            \
-  }                                                                 \
-)
-
-# cargo_license: print license information for all crate dependencies
-#
-# The "no-build,no-dev,no-proc-macro" argument results in only crates which are
-# linked into the final binary to be considered.
-#
-# Additionally, deprecated SPDX syntax ("/" instead of "OR") is normalized
-# before sorting the results to ensure reproducible output of this macro.
-#
-# This macro must be called with the same feature flags as other cargo macros,
-# in particular, "cargo_build", otherwise its output will be incomplete.
-#
-# The "cargo tree" command called by this macro will fail if there are missing
-# (optional) dependencies.
-%cargo_license(naf:)\
-(\
-set -euo pipefail\
-%{shrink:                                                           \
-    %{__cargo} tree                                                 \
-    --workspace                                                     \
-    --offline                                                       \
-    --edges no-build,no-dev,no-proc-macro                           \
-    --no-dedupe                                                     \
-    %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}                \
-    --prefix none                                                   \
-    --format "{l}: {p}"                                             \
-    | sed -e "s: ($(pwd)[^)]*)::g" -e "s: / :/:g" -e "s:/: OR :g"   \
-    | sort -u                                                       \
-}\
-)
-
-# cargo_license_summary: print license summary for all crate dependencies
-#
-# This macro works in the same way as cargo_license, except that it only prints
-# a list of licenses, and not the complete license information for every crate
-# in the dependency tree. This is useful for determining the correct License
-# tag for packages that contain compiled Rust binaries.
-%cargo_license_summary(naf:)\
-(\
-set -euo pipefail\
-%{shrink:                                                           \
-    %{__cargo} tree                                                 \
-    --workspace                                                     \
-    --offline                                                       \
-    --edges no-build,no-dev,no-proc-macro                           \
-    --no-dedupe                                                     \
-    %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}                \
-    --prefix none                                                   \
-    --format "# {l}"                                                \
-    | sed -e "s: / :/:g" -e "s:/: OR :g"                            \
-    | sort -u                                                       \
-}\
-)
-
-# cargo_vendor_manifest: write list of vendored crates and their versions
-#
-# The arguments for the internal "cargo tree" call emulate the logic
-# that determines which crates are included when running "cargo vendor".
-# The results are written to "cargo-vendor.txt".
-#
-# TODO: --all-features may be overly broad; this should be modified to
-# use %%__cargo_parse_opts to handle feature flags.
-%cargo_vendor_manifest()\
-(\
-set -euo pipefail\
-%{shrink:                                                           \
-    %{__cargo} tree                                                 \
-    --workspace                                                     \
-    --offline                                                       \
-    --edges normal,build                                            \
-    --no-dedupe                                                     \
-    --all-features                                                  \
-    --prefix none                                                   \
-    --format "{p}"                                                  \
-    | grep -v "$(pwd)"                                              \
-    | sed -e "s: (proc-macro)::"                                    \
-    | sort -u                                                       \
-    > cargo-vendor.txt                                              \
-}\
-)
-
diff --git a/plans/ci.fmf b/plans/ci.fmf
index 9160802..1ad2c12 100644
--- a/plans/ci.fmf
+++ b/plans/ci.fmf
@@ -1,6 +1,6 @@
 summary: CI Gating Plan
 discover:
     how: fmf
-    url: https://src.fedoraproject.org/tests/rust.git
+    directory: tests
 execute:
-    how: tmt
+    how: beakerlib
diff --git a/rpminspect.yaml b/rpminspect.yaml
deleted file mode 100644
index a12c8a4..0000000
--- a/rpminspect.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-debuginfo:
-    ignore:
-        # i686 has limited debuginfo. From rust.spec
-        # full debuginfo is exhausting memory; just do libstd for now
-        # https://github.com/rust-lang/rust/issues/45854
-        - /usr/lib/debug/usr/bin/rustc-*.i386.debug
-
-unicode:
-    ignore:
-        # These files are known to contain forbidden unicode chars as
-        # they are tests for those.
-        - rustc-*-src/tests/ui/lint/issue-90614-accept-allow-text-direction-codepoint-in-comment-lint.rs
-        - rustc-*-src/tests/ui/parser/unicode-control-codepoints.rs
-        - rustc-*-src/tests/ui/parser/macro/unicode-control-codepoints-macros.rs
-        - rustc-*-src/tests/ui/parser/macro/auxiliary/unicode-control.rs
-        - rustc-*-src/compiler/rustc_lint/src/hidden_unicode_codepoints.rs
-        - rustc-*-src/compiler/rustc_lint_defs/src/builtin.rs
-        - rustc-*-src/vendor/idna/tests/IdnaTestV2.txt
-        - rustc-*-src/vendor/idna-*/tests/IdnaTestV2.txt
-        - rustc-*-src/vendor/mdbook*/tests/testsuite/search/reasonable_search_index/expected_index.js
-        - rustc-*-src/vendor/mdbook*/tests/testsuite/search/reasonable_search_index/src/first/unicode.md
-        - rustc-*-src/vendor/wast-*/tests/parse-fail/confusing-string?.wat
-        - rustc-*-src/vendor/wast-*/tests/parse-fail/confusing-block-comment?.wat
-        - rustc-*-src/vendor/wast-*/tests/parse-fail/confusing-line-comment?.wat
-        - rustc-*-src/src/llvm-project/clang-tools-extra/docs/clang-tidy/checks/misc/misleading-bidirectional.rst
-        - rustc-*-src/src/gcc/gcc/testsuite/c-c++-common/*Wbidi*.c
diff --git a/rust-pr91070.patch b/rust-pr91070.patch
new file mode 100644
index 0000000..1b4f052
--- /dev/null
+++ b/rust-pr91070.patch
@@ -0,0 +1,94 @@
+diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
+index e77d29bed712..f3d8eb2602a3 100644
+--- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
++++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
+@@ -124,8 +124,18 @@ extern "C" LLVMValueRef LLVMRustGetOrInsertFunction(LLVMModuleRef M,
+ 
+ extern "C" LLVMValueRef
+ LLVMRustGetOrInsertGlobal(LLVMModuleRef M, const char *Name, size_t NameLen, LLVMTypeRef Ty) {
++  Module *Mod = unwrap(M);
+   StringRef NameRef(Name, NameLen);
+-  return wrap(unwrap(M)->getOrInsertGlobal(NameRef, unwrap(Ty)));
++
++  // We don't use Module::getOrInsertGlobal because that returns a Constant*,
++  // which may either be the real GlobalVariable*, or a constant bitcast of it
++  // if our type doesn't match the original declaration. We always want the
++  // GlobalVariable* so we can access linkage, visibility, etc.
++  GlobalVariable *GV = Mod->getGlobalVariable(NameRef, true);
++  if (!GV)
++    GV = new GlobalVariable(*Mod, unwrap(Ty), false,
++                            GlobalValue::ExternalLinkage, nullptr, NameRef);
++  return wrap(GV);
+ }
+ 
+ extern "C" LLVMValueRef
+diff --git a/src/test/ui/statics/issue-91050-1.rs b/src/test/ui/statics/issue-91050-1.rs
+new file mode 100644
+index 000000000000..403a41462ef1
+--- /dev/null
++++ b/src/test/ui/statics/issue-91050-1.rs
+@@ -0,0 +1,34 @@
++// build-pass
++// compile-flags: --crate-type=rlib --emit=llvm-ir -Cno-prepopulate-passes
++
++// This test declares globals by the same name with different types, which
++// caused problems because Module::getOrInsertGlobal would return a Constant*
++// bitcast instead of a GlobalVariable* that could access linkage/visibility.
++// In alt builds with LLVM assertions this would fail:
++//
++// rustc: /checkout/src/llvm-project/llvm/include/llvm/Support/Casting.h:269:
++// typename cast_retty::ret_type llvm::cast(Y *) [X = llvm::GlobalValue, Y = llvm::Value]:
++// Assertion `isa(Val) && "cast() argument of incompatible type!"' failed.
++//
++// In regular builds, the bad cast was UB, like "Invalid LLVMRustVisibility value!"
++
++pub mod before {
++    #[no_mangle]
++    pub static GLOBAL1: [u8; 1] = [1];
++}
++
++pub mod inner {
++    extern "C" {
++        pub static GLOBAL1: u8;
++        pub static GLOBAL2: u8;
++    }
++
++    pub fn call() {
++        drop(unsafe { (GLOBAL1, GLOBAL2) });
++    }
++}
++
++pub mod after {
++    #[no_mangle]
++    pub static GLOBAL2: [u8; 1] = [2];
++}
+diff --git a/src/test/ui/statics/issue-91050-2.rs b/src/test/ui/statics/issue-91050-2.rs
+new file mode 100644
+index 000000000000..2ff954d15cab
+--- /dev/null
++++ b/src/test/ui/statics/issue-91050-2.rs
+@@ -0,0 +1,24 @@
++// build-pass
++// compile-flags: --crate-type=rlib --emit=llvm-ir -Cno-prepopulate-passes
++
++// This is a variant of issue-91050-1.rs -- see there for an explanation.
++
++pub mod before {
++    extern "C" {
++        pub static GLOBAL1: [u8; 1];
++    }
++
++    pub unsafe fn do_something_with_array() -> u8 {
++        GLOBAL1[0]
++    }
++}
++
++pub mod inner {
++    extern "C" {
++        pub static GLOBAL1: u8;
++    }
++
++    pub unsafe fn call() -> u8 {
++        GLOBAL1 + 42
++    }
++}
diff --git a/rust.spec b/rust.spec
index b789949..abe8acf 100644
--- a/rust.spec
+++ b/rust.spec
@@ -1,84 +1,53 @@
-Name:           rust
-Version:        1.92.0
-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)
-URL:            https://www.rust-lang.org
-
-# Only x86_64, i686, and aarch64 are Tier 1 platforms at this time.
+# Only x86_64 and i686 are Tier 1 platforms at this time.
 # https://doc.rust-lang.org/nightly/rustc/platform-support.html
-%global rust_arches x86_64 i686 armv7hl aarch64 ppc64le s390x riscv64
-ExclusiveArch:  %{rust_arches}
+%global rust_arches x86_64 i686 armv7hl aarch64 ppc64le s390x
 
-# 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
+# The channel can be stable, beta, or nightly
+%{!?channel: %global channel beta}
+
+# To bootstrap from scratch, set the channel and date from src/stage0.txt
+# e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
 # or nightly wants some beta-YYYY-MM-DD
-%global bootstrap_version 1.91.0
-%global bootstrap_channel 1.91.0
-%global bootstrap_date 2025-10-30
+# Note that cargo matches the program version here, not its crate version.
+%global bootstrap_rust 1.56.1
+%global bootstrap_cargo 1.56.1
+%global bootstrap_channel 1.56.1
+%global bootstrap_date 2021-11-01
 
 # Only the specified arches will use bootstrap binaries.
-# NOTE: Those binaries used to be uploaded with every new release, but that was
-# a waste of lookaside cache space when they're most often unused.
-# Run "spectool -g rust.spec" after changing this and then "fedpkg upload" to
-# add them to sources. Remember to remove them again after the bootstrap build!
 #global bootstrap_arches %%{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_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}
+# Define a space-separated list of targets to ship rust-std-static-$triple for
+# cross-compilation. The packages are noarch, but they're not fully
+# reproducible between hosts, so only x86_64 actually builds it.
+%ifarch x86_64
 %if 0%{?fedora}
-%bcond_with bundled_wasi_libc
-%else
-%bcond_without bundled_wasi_libc
+%global cross_targets wasm32-unknown-unknown wasm32-wasi
 %endif
+%endif
+
+# We need CRT files for *-wasi targets
+%global forgeurl1 https://github.com/WebAssembly/wasi-libc
+%global commit1 ad5133410f66b93a2381db5b542aad5e0964db96
+%forgemeta -z 1
+%undefine distprefix1
+%global wasi_libc_source %{forgesource1}
+%global wasi_libc_dir %{_builddir}/%{extractdir1}
 
 # Using llvm-static may be helpful as an opt-in, e.g. to aid LLVM rebases.
 %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 20.0.0
-%global bundled_llvm_version 21.1.3
-#global llvm_compat_version 19
-%global llvm llvm%{?llvm_compat_version}
+# is insufficient.  Rust currently requires LLVM 10.0+.
 %bcond_with bundled_llvm
 
-# Requires stable libgit2 1.9, 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.1
-%if 0%{?fedora} >= 41
+# Requires stable libgit2 1.3
+%if 0%{?fedora} >= 36
 %bcond_with bundled_libgit2
 %else
 %bcond_without bundled_libgit2
 %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
-%global min_oniguruma_version 6.9.3
-%if 0%{?rhel} && 0%{?rhel} < 9
-%bcond_without bundled_oniguruma
-%else
-%bcond_with bundled_oniguruma
-%endif
-
-# Cargo uses UPSERTs with omitted conflict targets
-%global min_sqlite3_version 3.35
-%global bundled_sqlite3_version 3.50.2
-%if 0%{?rhel} && 0%{?rhel} < 10
-%bcond_without bundled_sqlite3
-%else
-%bcond_with bundled_sqlite3
-%endif
-
 %if 0%{?rhel}
 # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949)
 %bcond_without disabled_libssh2
@@ -86,80 +55,66 @@ ExclusiveArch:  %{rust_arches}
 %bcond_with disabled_libssh2
 %endif
 
-# 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
-%if 0%{?__isa_bits} == 32
-%global reduced_debuginfo 1
-%endif
-# Also on current riscv64 hardware, although future hardware will be
-# able to handle it.
-# e.g. http://fedora.riscv.rocks/koji/buildinfo?buildID=249870
-%ifarch riscv64
-%global reduced_debuginfo 1
-%endif
-
-%if 0%{?reduced_debuginfo}
-%global enable_debuginfo --debuginfo-level=0 --debuginfo-level-std=2
-%global enable_rust_opts --set rust.codegen-units-std=1
-%bcond_with rustc_pgo
+%if 0%{?rhel} && 0%{?rhel} < 8
+%bcond_with curl_http2
 %else
-# Build rustc with full debuginfo, CGU=1, ThinLTO, and PGO.
-%global enable_debuginfo --debuginfo-level=2
-%global enable_rust_opts --set rust.codegen-units=1 --set rust.lto=thin
-%bcond_without rustc_pgo
+%bcond_without curl_http2
 %endif
 
-# 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)
-  rpm.define("channel " .. (subs ~= 0 and version_channel or "stable"))
-  rpm.define("rustc_package rustc-" .. version_channel .. "-src")
-end}
+# LLDB isn't available everywhere...
+%if 0%{?rhel} && 0%{?rhel} < 8
+%bcond_with lldb
+%else
+%bcond_without lldb
+%endif
+
+Name:           rust
+Version:        1.57.0~beta.8
+Release:        1%{?dist}
+Summary:        The Rust Programming Language
+License:        (ASL 2.0 or MIT) and (BSD and MIT)
+# ^ written as: (rust itself) and (bundled libraries)
+URL:            https://www.rust-lang.org
+ExclusiveArch:  %{rust_arches}
+
+%if "%{channel}" == "stable"
+%global rustc_package rustc-%{version}-src
+%else
+%global rustc_package rustc-%{channel}-src
+%endif
 Source0:        https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
 Source1:        %{wasi_libc_source}
 # Sources for bootstrap_arches are inserted by lua below
 
-# By default, rust tries to use "rust-lld" as a linker for some targets.
-Patch1:         0001-Use-lld-provided-by-system.patch
+# Fix a bad typecast for LLVM globals, rhbz#1990657
+# https://github.com/rust-lang/rust/pull/91070
+Patch1:         rust-pr91070.patch
 
-# Set a substitute-path in rust-gdb for standard library sources.
-Patch2:         rustc-1.70.0-rust-gdb-substitute-path.patch
-
-# Override default target CPUs to match distro settings
-# TODO: upstream this ability into the actual build configuration
-Patch3:         0001-Let-environment-variables-override-some-default-CPUs.patch
-
-# Override the default self-contained system libraries
-# TODO: the first can probably be upstreamed, but the second is hard-coded,
-# and we're only applying that if not with bundled_wasi_libc.
-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
-
-# stage0 tries to copy all of /usr/lib, sometimes unsuccessfully, see #143735
-Patch7:         0001-only-copy-rustlib-into-stage0-sysroot.patch
+# By default, rust tries to use "rust-lld" as a linker for WebAssembly.
+Patch2:         0001-Use-lld-provided-by-system-for-wasm.patch
 
 ### RHEL-specific patches below ###
 
-# Simple rpm macros for rust-toolset (as opposed to full rust-packaging)
-Source100:      macros.rust-toolset
-Source101:      macros.rust-srpm
-Source102:      cargo_vendor.attr
-Source103:      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.56.0-disable-libssh2.patch
 
-# Get the Rust triple for any architecture and ABI.
-%{lua: function rust_triple(arch, abi)
-  abi = abi or "gnu"
+# libcurl on RHEL7 doesn't have http2, but since cargo requests it, curl-sys
+# will try to build it statically -- instead we turn off the feature.
+Patch101:       rustc-1.57.0-disable-http2.patch
+
+# kernel rh1410097 causes too-small stacks for PIE.
+# (affects RHEL6 kernels when building for RHEL7)
+Patch102:       rustc-1.57.0-no-default-pie.patch
+
+
+# Get the Rust triple for any arch.
+%{lua: function rust_triple(arch)
+  local abi = "gnu"
   if arch == "armv7hl" then
     arch = "armv7"
-    abi = abi.."eabihf"
+    abi = "gnueabihf"
+  elseif arch == "ppc64" then
+    arch = "powerpc64"
   elseif arch == "ppc64le" then
     arch = "powerpc64le"
   elseif arch == "riscv64" then
@@ -168,77 +123,42 @@ Patch100:       rustc-1.92.0-disable-libssh2.patch
   return arch.."-unknown-linux-"..abi
 end}
 
-%define rust_triple() %{lua: print(rust_triple(
-  rpm.expand("%{?1}%{!?1:%{_target_cpu}}"),
-  rpm.expand("%{?2}%{!?2:gnu}")
-))}
-
-# Get the environment variable form of the Rust triple.
-%define rust_triple_env() %{lua:
-  print(rpm.expand("%{rust_triple %*}"):gsub("-", "_"):upper())
-}
-
-# Define a space-separated list of targets to ship rust-std-static-$triple for
-# cross-compilation. The packages are noarch, but they're not fully
-# reproducible between hosts, so only x86_64 actually builds it.
-%ifarch x86_64
-%if 0%{?fedora}
-%global mingw_targets i686-pc-windows-gnu x86_64-pc-windows-gnu
-%endif
-%global wasm_targets wasm32-unknown-unknown wasm32-wasip1
-%if 0%{?fedora}
-%global extra_targets x86_64-unknown-none x86_64-unknown-uefi
-%endif
-%if 0%{?rhel} >= 10
-%global extra_targets x86_64-unknown-none
-%endif
-%endif
-%ifarch aarch64
-%if 0%{?fedora}
-%global extra_targets aarch64-unknown-none-softfloat aarch64-unknown-uefi
-%endif
-%if 0%{?rhel} >= 10
-%global extra_targets aarch64-unknown-none-softfloat
-%endif
-%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)
-}
+%global rust_triple %{lua: print(rust_triple(rpm.expand("%{_target_cpu}")))}
 
 %if %defined bootstrap_arches
 # For each bootstrap arch, add an additional binary Source.
 # 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}")
-  local channel = rpm.expand("%{bootstrap_channel}")
+  local base = rpm.expand("https://static.rust-lang.org/dist/%{bootstrap_date}"
+                          .."/rust-%{bootstrap_channel}")
   local target_arch = rpm.expand("%{_target_cpu}")
   for i, arch in ipairs(bootstrap_arches) do
-    i = 1000 + i * 3
-    local suffix = channel.."-"..rust_triple(arch)
-    print(string.format("Source%d: %s/cargo-%s.tar.xz\n", i, base, suffix))
-    print(string.format("Source%d: %s/rustc-%s.tar.xz\n", i+1, base, suffix))
-    print(string.format("Source%d: %s/rust-std-%s.tar.xz\n", i+2, base, suffix))
+    i = 100 + i
+    print(string.format("Source%d: %s-%s.tar.xz\n",
+                        i, base, rust_triple(arch)))
     if arch == target_arch then
-      rpm.define("bootstrap_source_cargo "..i)
-      rpm.define("bootstrap_source_rustc "..i+1)
-      rpm.define("bootstrap_source_std "..i+2)
-      rpm.define("bootstrap_suffix "..suffix)
+      rpm.define("bootstrap_source "..i)
     end
   end
 end}
 %endif
 
 %ifarch %{bootstrap_arches}
-%global local_rust_root %{_builddir}/rust-%{bootstrap_suffix}
-Provides:       bundled(%{name}-bootstrap) = %{bootstrap_version}
+%global bootstrap_root rust-%{bootstrap_channel}-%{rust_triple}
+%global local_rust_root %{_builddir}/%{bootstrap_root}/usr
+Provides:       bundled(%{name}-bootstrap) = %{bootstrap_rust}
 %else
-BuildRequires:  (cargo >= %{bootstrap_version} with cargo <= %{version})
-BuildRequires:  (%{name} >= %{bootstrap_version} with %{name} <= %{version})
+BuildRequires:  cargo >= %{bootstrap_cargo}
+%if 0%{?rhel} && 0%{?rhel} < 8
+BuildRequires:  %{name} >= %{bootstrap_rust}
+BuildConflicts: %{name} > %{version}
+%else
+BuildRequires:  (%{name} >= %{bootstrap_rust} with %{name} <= %{version})
+%endif
 %global local_rust_root %{_prefix}
 %endif
 
@@ -246,6 +166,7 @@ BuildRequires:  make
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  ncurses-devel
+BuildRequires:  curl
 # explicit curl-devel to avoid httpd24-curl (rhbz1540167)
 BuildRequires:  curl-devel
 BuildRequires:  pkgconfig(libcurl)
@@ -254,60 +175,44 @@ BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(zlib)
 
 %if %{without bundled_libgit2}
-BuildRequires:  (pkgconfig(libgit2) >= %{min_libgit2_version} with pkgconfig(libgit2) < %{next_libgit2_version})
-%endif
-
-%if %{without bundled_oniguruma}
-BuildRequires:  pkgconfig(oniguruma) >= %{min_oniguruma_version}
-%endif
-
-%if %{without bundled_sqlite3}
-BuildRequires:  pkgconfig(sqlite3) >= %{min_sqlite3_version}
+BuildRequires:  pkgconfig(libgit2) >= 1.3.0
 %endif
 
 %if %{without disabled_libssh2}
-BuildRequires:  pkgconfig(libssh2)
+# needs libssh2_userauth_publickey_frommemory
+BuildRequires:  pkgconfig(libssh2) >= 1.6.0
 %endif
 
-%if 0%{?rhel} == 8
-BuildRequires:  platform-python
-%else
-BuildRequires:  python3
-%endif
-BuildRequires:  python3-rpm-macros
+%global python python3
+BuildRequires:  %{python}
 
 %if %with bundled_llvm
-BuildRequires:  cmake >= 3.20.0
+BuildRequires:  cmake3 >= 3.13.4
 BuildRequires:  ninja-build
-Provides:       bundled(llvm) = %{bundled_llvm_version}
+Provides:       bundled(llvm) = 13.0.0
 %else
-BuildRequires:  cmake >= 3.5.1
-%if %defined llvm_compat_version
+BuildRequires:  cmake >= 2.8.11
+%if 0%{?epel} == 7
+%global llvm llvm11
+%endif
+%if %defined llvm
 %global llvm_root %{_libdir}/%{llvm}
-%global llvm_path %{llvm_root}/bin
 %else
+%global llvm llvm
 %global llvm_root %{_prefix}
 %endif
-BuildRequires:  %{llvm}-devel >= %{min_llvm_version}
+BuildRequires:  %{llvm}-devel >= 10.0
 %if %with llvm_static
 BuildRequires:  %{llvm}-static
 BuildRequires:  libffi-devel
-BuildRequires:  libxml2-devel
 %endif
 %endif
 
-# make check needs "ps" for src/test/ui/wait-forked-but-failed-child.rs
+# make check needs "ps" for src/test/run-pass/wait-forked-but-failed-child.rs
 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
 
 # Virtual provides for folks who attempt "dnf install rustc"
 Provides:       rustc = %{version}-%{release}
@@ -316,12 +221,18 @@ Provides:       rustc%{?_isa} = %{version}-%{release}
 # Always require our exact standard library
 Requires:       %{name}-std-static%{?_isa} = %{version}-%{release}
 
-# The C compiler is needed at runtime just for linking. Someday rustc might
+# The C compiler is needed at runtime just for linking.  Someday rustc might
 # invoke the linker directly, and then we'll only need binutils.
 # https://github.com/rust-lang/rust/issues/11937
 Requires:       /usr/bin/cc
 
-%global __ranlib %{_bindir}/ranlib
+%if 0%{?epel} == 7
+%global devtoolset_name devtoolset-9
+BuildRequires:  %{devtoolset_name}-gcc
+BuildRequires:  %{devtoolset_name}-gcc-c++
+%global __cc /opt/rh/%{devtoolset_name}/root/usr/bin/gcc
+%global __cxx /opt/rh/%{devtoolset_name}/root/usr/bin/g++
+%endif
 
 # ALL Rust libraries are private, because they don't keep an ABI.
 %global _privatelibs lib(.*-[[:xdigit:]]{16}*|rustc.*)[.]so.*
@@ -333,72 +244,36 @@ Requires:       /usr/bin/cc
 # While we don't want to encourage dynamic linking to Rust shared libraries, as
 # there's no stable ABI, we still need the unallocated metadata (.rustc) to
 # support custom-derive plugins like #[proc_macro_derive(Foo)].
+%if 0%{?rhel} && 0%{?rhel} < 8
+# eu-strip is very eager by default, so we have to limit it to -g, only debugging symbols.
+%global _find_debuginfo_opts -g
+%undefine _include_minidebuginfo
+%else
+# Newer find-debuginfo.sh supports --keep-section, which is preferable. rhbz1465997
 %global _find_debuginfo_opts --keep-section .rustc
+%endif
 
-# The standard library rlibs are essentially static archives, but we don't want
-# to strip them because that impairs the debuginfo of all Rust programs.
-# It also had a tendency to break the cross-compiled libraries:
-# - wasm targets lost the archive index, which we were repairing with llvm-ranlib
-# - uefi targets couldn't link builtins like memcpy, possibly due to lost COMDAT flags
-%global __brp_strip_static_archive %{nil}
-%global __brp_strip_lto %{nil}
+# Use hardening ldflags.
+%global rustflags -Clink-arg=-Wl,-z,relro,-z,now
+
+%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
 %global rustlibdir %{common_libdir}/rustlib
 
-%if %defined mingw_targets
-BuildRequires:  mingw32-filesystem >= 95
-BuildRequires:  mingw64-filesystem >= 95
-BuildRequires:  mingw32-crt
-BuildRequires:  mingw64-crt
-BuildRequires:  mingw32-gcc
-BuildRequires:  mingw64-gcc
-BuildRequires:  mingw32-winpthreads-static
-BuildRequires:  mingw64-winpthreads-static
-%endif
-
-%if %defined wasm_targets
-%if %with bundled_wasi_libc
-BuildRequires:  clang%{?llvm_compat_version}
-%else
-BuildRequires:  wasi-libc-static
-%endif
-BuildRequires:  lld%{?llvm_compat_version}
-%endif
-
-# For profiler_builtins
-BuildRequires:  compiler-rt%{?llvm_compat_version}
-
-# This component was removed as of Rust 1.69.0.
-# 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                     \
-      RUSTC=%{local_rust_root}/bin/rustc      \
-      %{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  \
-  }                                           \
-)
-%ifnarch %{bootstrap_arches}
-%{?fedora:BuildRequires: cargo-rpm-macros}
-%{?rhel:BuildRequires: rust-toolset}
+%if %defined cross_targets
+BuildRequires:  clang
+# brp-strip-static-archive breaks the archive index for wasm
+%global __os_install_post \
+%__os_install_post \
+find '%{buildroot}%{rustlibdir}' -type f -path '*/wasm*/lib/*.rlib' -print -exec '%{llvm_root}/bin/llvm-ranlib' '{}' ';' \
+%{nil}
 %endif
 
 %description
@@ -410,89 +285,41 @@ This package includes the Rust compiler and documentation generator.
 
 %package std-static
 Summary:        Standard library for Rust
-Provides:       %{name}-std-static-%{rust_triple} = %{version}-%{release}
-Requires:       %{name} = %{version}-%{release}
-Requires:       glibc-devel%{?_isa} >= 2.17
 
 %description std-static
 This package includes the standard libraries for building applications
 written in Rust.
 
-%global target_package()                        \
-%package std-static-%1                          \
-Summary:        Standard library for Rust %1    \
-Requires:       %{name} = %{version}-%{release}
+%if %defined cross_targets
+%{lua: do
+  for triple in string.gmatch(rpm.expand("%{cross_targets}"), "%S+") do
+    local subs = {
+      triple = triple,
+      verrel = rpm.expand("%{version}-%{release}"),
+      wasm = string.sub(triple, 1, 4) == "wasm" and 1 or 0,
+      wasi = string.find(triple, "-wasi") and 1 or 0,
+    }
+    local s = string.gsub([[
 
-%global target_description()                                            \
-%description std-static-%1                                              \
-This package includes the standard libraries for building applications  \
-written in Rust for the %2 target %1.
-
-%if %target_enabled i686-pc-windows-gnu
-%target_package i686-pc-windows-gnu
-Requires:       mingw32-crt
-Requires:       mingw32-gcc
-Requires:       mingw32-winpthreads-static
-Provides:       mingw32-rust = %{version}-%{release}
-Provides:       mingw32-rustc = %{version}-%{release}
+%package std-static-{{triple}}
+Summary:        Standard library for Rust
 BuildArch:      noarch
-%target_description i686-pc-windows-gnu MinGW
-%endif
-
-%if %target_enabled x86_64-pc-windows-gnu
-%target_package x86_64-pc-windows-gnu
-Requires:       mingw64-crt
-Requires:       mingw64-gcc
-Requires:       mingw64-winpthreads-static
-Provides:       mingw64-rust = %{version}-%{release}
-Provides:       mingw64-rustc = %{version}-%{release}
-BuildArch:      noarch
-%target_description x86_64-pc-windows-gnu MinGW
-%endif
-
-%if %target_enabled wasm32-unknown-unknown
-%target_package wasm32-unknown-unknown
+Requires:       rust = {{verrel}}
+%if {{wasm}}
 Requires:       lld >= 8.0
-BuildArch:      noarch
-%target_description wasm32-unknown-unknown WebAssembly
 %endif
-
-%if %target_enabled wasm32-wasip1
-%target_package wasm32-wasip1
-Requires:       lld >= 8.0
-%if %with bundled_wasi_libc
+%if {{wasi}}
 Provides:       bundled(wasi-libc)
-%else
-Requires:       wasi-libc-static
-%endif
-BuildArch:      noarch
-# https://blog.rust-lang.org/2024/04/09/updates-to-rusts-wasi-targets.html
-Obsoletes:      %{name}-std-static-wasm32-wasi < 1.84.0~
-%target_description wasm32-wasip1 WebAssembly
 %endif
 
-%if %target_enabled x86_64-unknown-none
-%target_package x86_64-unknown-none
-Requires:       lld
-%target_description x86_64-unknown-none embedded
-%endif
+%description std-static-{{triple}}
+This package includes the standard libraries for building applications
+written in Rust for the {{triple}} target.
 
-%if %target_enabled aarch64-unknown-uefi
-%target_package aarch64-unknown-uefi
-Requires:       lld
-%target_description aarch64-unknown-uefi embedded
-%endif
-
-%if %target_enabled x86_64-unknown-uefi
-%target_package x86_64-unknown-uefi
-Requires:       lld
-%target_description x86_64-unknown-uefi embedded
-%endif
-
-%if %target_enabled aarch64-unknown-none-softfloat
-%target_package aarch64-unknown-none-softfloat
-Requires:       lld
-%target_description aarch64-unknown-none-softfloat embedded
+]], "{{(%w+)}}", subs)
+    print(s)
+  end
+end}
 %endif
 
 
@@ -509,27 +336,27 @@ 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
 programs.
 
 
+%if %with lldb
+
 %package lldb
 Summary:        LLDB pretty printers for Rust
 BuildArch:      noarch
 Requires:       lldb
-Requires:       python3-lldb
+Requires:       %{python}-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
 programs.
 
+%endif
+
 
 %package doc
 Summary:        Documentation for Rust
@@ -538,12 +365,6 @@ Summary:        Documentation for Rust
 # Koji will fail the build in rpmdiff if two architectures build a noarch
 # subpackage differently, so instead we have to keep its arch.
 
-# Cargo no longer builds its own documentation
-# https://github.com/rust-lang/cargo/pull/4904
-# We used to keep a shim cargo-doc package, but now that's merged too.
-Obsoletes:      cargo-doc < 1.65.0~
-Provides:       cargo-doc = %{version}-%{release}
-
 %description doc
 This package includes HTML documentation for the Rust programming language and
 its standard library.
@@ -552,18 +373,14 @@ its standard library.
 %package -n cargo
 Summary:        Rust's package manager and build tool
 %if %with bundled_libgit2
-Provides:       bundled(libgit2) = %{bundled_libgit2_version}
-%endif
-%if %with bundled_sqlite3
-Provides:       bundled(sqlite) = %{bundled_sqlite3_version}
+Provides:       bundled(libgit2) = 1.3.0
 %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}
+BuildRequires:  git
+# Cargo is not much use without Rust
+Requires:       rust
 
-# "cargo vendor" is a builtin command starting with 1.37. The Obsoletes and
+# "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
 Obsoletes:      cargo-vendor <= 0.1.23
 Provides:       cargo-vendor = %{version}-%{release}
@@ -573,13 +390,21 @@ Cargo is a tool that allows Rust projects to declare their various dependencies
 and ensure that you'll always get a repeatable build.
 
 
+%package -n cargo-doc
+Summary:        Documentation for Cargo
+BuildArch:      noarch
+# Cargo no longer builds its own documentation
+# https://github.com/rust-lang/cargo/pull/4904
+Requires:       rust-doc = %{version}-%{release}
+
+%description -n cargo-doc
+This package includes HTML documentation for Cargo.
+
+
 %package -n rustfmt
 Summary:        Tool to find and fix Rust formatting issues
 Requires:       cargo
 
-# /usr/bin/rustfmt is dynamically linked against internal rustc libs
-Requires:       %{name}%{?_isa} = %{version}-%{release}
-
 # The component/package was rustfmt-preview until Rust 1.31.
 Obsoletes:      rustfmt-preview < 1.0.0
 Provides:       rustfmt-preview = %{version}-%{release}
@@ -588,25 +413,24 @@ Provides:       rustfmt-preview = %{version}-%{release}
 A tool for formatting Rust code according to style guidelines.
 
 
-%package analyzer
-Summary:        Rust implementation of the Language Server Protocol
-
-# /usr/bin/rust-analyzer is dynamically linked against internal rustc libs
+%package -n rls
+Summary:        Rust Language Server for IDE integration
+%if %with bundled_libgit2
+Provides:       bundled(libgit2) = 1.3.0
+%endif
+Requires:       rust-analysis
+# /usr/bin/rls is dynamically linked against internal rustc libs
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-# The standard library sources are needed for most functionality.
-Recommends:     %{name}-src
-
-# RLS is no longer available as of Rust 1.65, but we're including the stub
-# binary that implements LSP just enough to recommend rust-analyzer.
-Obsoletes:      rls < 1.65.0~
 # The component/package was rls-preview until Rust 1.31.
 Obsoletes:      rls-preview < 1.31.6
+Provides:       rls-preview = %{version}-%{release}
 
-%description analyzer
-rust-analyzer is an implementation of Language Server Protocol for the Rust
-programming language. It provides features like completion and goto definition
-for many code editors, including VS Code, Emacs and Vim.
+%description -n rls
+The Rust Language Server provides a server that runs in the background,
+providing IDEs, editors, and other tools with information about Rust programs.
+It supports functionality such as 'goto definition', symbol search,
+reformatting, and code completion, and enables renaming and refactorings.
 
 
 %package -n clippy
@@ -626,136 +450,99 @@ A collection of lints to catch common mistakes and improve your Rust code.
 %package src
 Summary:        Sources for the Rust standard library
 BuildArch:      noarch
-Recommends:     %{name}-std-static = %{version}-%{release}
 
 %description src
-This package includes source files for the Rust standard library. It may be
+This package includes source files for the Rust standard library.  It may be
 useful as a reference for code completion tools in various editors.
 
 
-%if 0%{?rhel}
+%package analysis
+Summary:        Compiler analysis data for the Rust standard library
+Requires:       rust-std-static%{?_isa} = %{version}-%{release}
 
-%package toolset-srpm-macros
-Summary:        RPM macros for building Rust source packages
-BuildArch:      noarch
-
-# This used to be from its own source package, versioned like rust2rpm.
-Obsoletes:      rust-srpm-macros < 18~
-Provides:       rust-srpm-macros = 25.2
-
-%description toolset-srpm-macros
-RPM macros for building source packages for Rust projects.
-
-
-%package toolset
-Summary:        Rust Toolset
-BuildArch:      noarch
-Requires:       rust = %{version}-%{release}
-Requires:       cargo = %{version}-%{release}
-Requires:       rust-toolset-srpm-macros = %{version}-%{release}
-Conflicts:      cargo-rpm-macros
-
-%description toolset
-This is the metapackage for Rust Toolset, bringing in the Rust compiler,
-the Cargo package manager, and a few convenience macros for rpm builds.
-
-%endif
+%description analysis
+This package contains analysis data files produced with rustc's -Zsave-analysis
+feature for the Rust standard library. The RLS (Rust Language Server) uses this
+data to provide information about the Rust standard library.
 
 
 %prep
 
 %ifarch %{bootstrap_arches}
-rm -rf %{local_rust_root}
-%setup -q -n cargo-%{bootstrap_suffix} -T -b %{bootstrap_source_cargo}
-./install.sh --prefix=%{local_rust_root} --disable-ldconfig
-%setup -q -n rustc-%{bootstrap_suffix} -T -b %{bootstrap_source_rustc}
-./install.sh --prefix=%{local_rust_root} --disable-ldconfig
-%setup -q -n rust-std-%{bootstrap_suffix} -T -b %{bootstrap_source_std}
-./install.sh --prefix=%{local_rust_root} --disable-ldconfig
+%setup -q -n %{bootstrap_root} -T -b %{bootstrap_source}
+./install.sh --components=cargo,rustc,rust-std-%{rust_triple} \
+  --prefix=%{local_rust_root} --disable-ldconfig
 test -f '%{local_rust_root}/bin/cargo'
 test -f '%{local_rust_root}/bin/rustc'
 %endif
 
-%if %{defined wasm_targets} && %{with bundled_wasi_libc}
-%setup -q -n %{wasi_libc_name} -T -b 1
-rm -rf %{wasi_libc_dir}/dlmalloc/
+%if %defined cross_targets
+%forgesetup -z 1
 %endif
 
 %setup -q -n %{rustc_package}
 
-%patch -P1 -p1
-%patch -P2 -p1
-%patch -P3 -p1
-%patch -P4 -p1
-%if %without bundled_wasi_libc
-%patch -P5 -p1
-%endif
-%if %without bundled_sqlite3
-%patch -P6 -p1
-%endif
-%patch -P7 -p1
+%patch1 -p1
+%patch2 -p1
 
 %if %with disabled_libssh2
-%patch -P100 -p1
+%patch100 -p1
 %endif
 
-# Use our explicit python3 first
-sed -i.try-python -e '/^try python3 /i try "%{__python3}" "$@"' ./configure
+%if %without curl_http2
+%patch101 -p1
+rm -rf vendor/libnghttp2-sys/
+%endif
 
-# Set a substitute-path in rust-gdb for standard library sources.
-sed -i.rust-src -e "s#@BUILDDIR@#$PWD#" ./src/etc/rust-gdb
+%if 0%{?rhel} && 0%{?rhel} < 8
+%patch102 -p1
+%endif
+
+%if "%{python}" != "python3"
+# Use our preferred python first
+sed -i.try-python -e '/^try python3 /i try "%{python}" "$@"' ./configure
+%endif
 
 %if %without bundled_llvm
 rm -rf src/llvm-project/
 mkdir -p src/llvm-project/libunwind/
 %endif
 
-# Remove submodules we don't need.
-rm -rf src/gcc
-rm -rf src/tools/enzyme
-rm -rf src/tools/rustc-perf/collector/*-benchmarks/
-
-# Remove other unused vendored libraries. This leaves the directory in place,
-# because some build scripts watch them, e.g. "cargo:rerun-if-changed=curl".
-%define clear_dir() find ./%1 -mindepth 1 -delete
-%clear_dir vendor/curl-sys*/curl/
-%clear_dir vendor/*jemalloc-sys*/jemalloc/
-%clear_dir vendor/libffi-sys*/libffi/
-%clear_dir vendor/libmimalloc-sys*/c_src/mimalloc/
-%clear_dir vendor/libsqlite3-sys*/sqlcipher/
-%clear_dir vendor/libssh2-sys*/libssh2/
-%clear_dir vendor/libz-sys*/src/zlib{,-ng}/
-%clear_dir vendor/lzma-sys*/xz-*/
-%clear_dir vendor/openssl-src*/openssl/
+# Remove other unused vendored libraries
+rm -rf vendor/curl-sys/curl/
+rm -rf vendor/jemalloc-sys/jemalloc/
+rm -rf vendor/libssh2-sys/libssh2/
+rm -rf vendor/libz-sys/src/zlib/
+rm -rf vendor/libz-sys/src/zlib-ng/
+rm -rf vendor/lzma-sys/xz-*/
+rm -rf vendor/openssl-src/openssl/
 
 %if %without bundled_libgit2
-%clear_dir vendor/libgit2-sys*/libgit2/
-%endif
-
-%if %without bundled_oniguruma
-%clear_dir vendor/onig_sys*/oniguruma/
-%endif
-
-%if %without bundled_sqlite3
-%clear_dir vendor/libsqlite3-sys*/sqlite3/
+rm -rf vendor/libgit2-sys/libgit2/
 %endif
 
 %if %with disabled_libssh2
-rm -rf vendor/libssh2-sys*/
+rm -rf vendor/libssh2-sys/
 %endif
 
 # This only affects the transient rust-installer, but let it use our dynamic xz-libs
-sed -i.lzma -e '/LZMA_API_STATIC/d' src/bootstrap/src/core/build_steps/tool.rs
+sed -i.lzma -e '/LZMA_API_STATIC/d' src/bootstrap/tool.rs
+
+%if %{with bundled_llvm} && 0%{?epel} == 7
+mkdir -p cmake-bin
+ln -s /usr/bin/cmake3 cmake-bin/cmake
+%global cmake_path $PWD/cmake-bin
+%endif
 
 %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" {}' \
-  compiler/rustc_llvm/src/lib.rs
+sed -i.ffi -e '$a #[link(name = "ffi")] extern {}' \
+  src/librustc_llvm/lib.rs
 %endif
 
 # The configure macro will modify some autoconf-related files, which upsets
-# cargo when it tries to verify checksums in those files. If we just truncate
+# cargo when it tries to verify checksums in those files.  If we just truncate
 # that file list, cargo won't have anything to complain about.
 find vendor -name .cargo-checksum.json \
   -exec sed -i.uncheck -e 's/"files":{[^}]*}/"files":{ }/' '{}' '+'
@@ -764,209 +551,105 @@ find vendor -name .cargo-checksum.json \
 # it's a shebang and make them executable. Then brp-mangle-shebangs gets upset...
 find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+'
 
-# The distro flags are only appropriate for the host, not our cross-targets,
-# and they're not as fine-grained as the settings we choose for std vs rustc.
-%if %defined build_rustflags
-%global build_rustflags %{nil}
+# Set up shared environment variables for build/install/check
+%global rust_env RUSTFLAGS="%{rustflags}"
+%if 0%{?cmake_path:1}
+%global rust_env %{rust_env} PATH="%{cmake_path}:$PATH"
+%endif
+%if %without disabled_libssh2
+# convince libssh2-sys to use the distro libssh2
+%global rust_env %{rust_env} LIBSSH2_SYS_USE_PKG_CONFIG=1
 %endif
 
-# These are similar to __cflags_arch_* in /usr/lib/rpm/redhat/macros
-%global rustc_target_cpus %{lua: do
-  local fedora = tonumber(rpm.expand("0%{?fedora}"))
-  local rhel = tonumber(rpm.expand("0%{?rhel}"))
-  local env =
-    " RUSTC_TARGET_CPU_X86_64=x86-64" .. ((rhel >= 10) and "-v3" or (rhel == 9) and "-v2" or "")
-    .. " RUSTC_TARGET_CPU_PPC64LE=" .. ((rhel >= 9) and "pwr9" or "pwr8")
-    .. " RUSTC_TARGET_CPU_S390X=" ..
-        ((rhel >= 9) and "z14" or (rhel == 8 or fedora >= 38) and "z13" or
-         (fedora >= 26) and "zEC12" or (rhel == 7) and "z196" or "z10")
-  print(env)
-end}
-
-# Set up shared environment variables for build/install/check.
-# *_USE_PKG_CONFIG=1 convinces *-sys crates to use the system library.
-%global rust_env %{shrink:
-  %{?rustflags:RUSTFLAGS="%{rustflags}"}
-  %{rustc_target_cpus}
-  %{!?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}
 
 %build
-%{export_rust_env}
+export %{rust_env}
+
+%ifarch %{arm} %{ix86} s390x
+# full debuginfo is exhausting memory; just do libstd for now
+# https://github.com/rust-lang/rust/issues/45854
+%if 0%{?rhel} && 0%{?rhel} < 8
+# Older rpmbuild didn't work with partial debuginfo coverage.
+%global debug_package %{nil}
+%define enable_debuginfo --debuginfo-level=0
+%else
+%define enable_debuginfo --debuginfo-level=0 --debuginfo-level-std=2
+%endif
+%else
+%define enable_debuginfo --debuginfo-level=2
+%endif
 
 # 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
-%define constrain_build(m:) %{lua:
-  for l in io.lines('/proc/meminfo') do
-    if l:sub(1, 9) == "MemTotal:" then
-      local opt_m = math.tointeger(rpm.expand("%{-m*}"))
-      local mem_total = math.tointeger(string.match(l, "MemTotal:%s+(%d+)"))
-      local cpu_limit = math.max(1, mem_total // (opt_m * 1024))
-      if cpu_limit < math.tointeger(rpm.expand("%_smp_build_ncpus")) then
-        rpm.define("_smp_build_ncpus " .. cpu_limit)
-      end
-      break
+# At least 2GB per CPU is a good rule of thumb for building rustc.
+ncpus=$(/usr/bin/getconf _NPROCESSORS_ONLN)
+max_cpus=$(( ($(free -g | awk '/^Mem:/{print $2}') + 1) / 2 ))
+if [ "$max_cpus" -ge 1 -a "$max_cpus" -lt "$ncpus" ]; then
+  ncpus="$max_cpus"
+fi
+
+%if %defined cross_targets
+%make_build -C %{wasi_libc_dir}
+%{lua: do
+  local wasi_root = rpm.expand("%{wasi_libc_dir}") .. "/sysroot"
+  local set_wasi_root = ""
+  for triple in string.gmatch(rpm.expand("%{cross_targets}"), "%S+") do
+    if string.find(triple, "-wasi") then
+      set_wasi_root = set_wasi_root .. " --set target." .. triple .. ".wasi-root=" .. wasi_root
     end
   end
-}
+  if wasi_root ~= "" then
+    rpm.define("set_wasi_root "..set_wasi_root)
+  end
+end}
 %endif
-%constrain_build -m 4096
-
-%if %defined mingw_targets
-%define mingw_target_config %{shrink:
-  --set target.i686-pc-windows-gnu.linker=%{mingw32_cc}
-  --set target.i686-pc-windows-gnu.cc=%{mingw32_cc}
-  --set target.i686-pc-windows-gnu.ar=%{mingw32_ar}
-  --set target.i686-pc-windows-gnu.ranlib=%{mingw32_ranlib}
-  --set target.i686-pc-windows-gnu.self-contained=false
-  --set target.x86_64-pc-windows-gnu.linker=%{mingw64_cc}
-  --set target.x86_64-pc-windows-gnu.cc=%{mingw64_cc}
-  --set target.x86_64-pc-windows-gnu.ar=%{mingw64_ar}
-  --set target.x86_64-pc-windows-gnu.ranlib=%{mingw64_ranlib}
-  --set target.x86_64-pc-windows-gnu.self-contained=false
-}
-%endif
-
-%if %defined wasm_targets
-%if %with bundled_wasi_libc
-%define wasi_libc_flags MALLOC_IMPL=emmalloc CC=clang AR=llvm-ar NM=llvm-nm
-%make_build --quiet -C %{wasi_libc_dir} %{wasi_libc_flags} TARGET_TRIPLE=wasm32-wasip1
-%define wasm_target_config %{shrink:
-  --set target.wasm32-wasip1.wasi-root=%{wasi_libc_dir}/sysroot
-}
-%else
-%define wasm_target_config %{shrink:
-  --set target.wasm32-wasip1.wasi-root=%{_prefix}/wasm32-wasi
-  --set target.wasm32-wasip1.self-contained=false
-}
-%endif
-%endif
-
-# Find the compiler-rt library for the Rust profiler_builtins and optimized-builtins crates.
-%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} \
   --build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple} \
   --set target.%{rust_triple}.linker=%{__cc} \
   --set target.%{rust_triple}.cc=%{__cc} \
   --set target.%{rust_triple}.cxx=%{__cxx} \
-  --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} \
+  --python=%{python} \
   --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 \
-  --disable-lld \
   --disable-rpath \
   %{enable_debuginfo} \
-  %{enable_rust_opts} \
-  --set build.jobs=%_smp_build_ncpus \
-  --set build.build-stage=2 \
-  --set build.doc-stage=2 \
-  --set build.install-stage=2 \
-  --set build.test-stage=2 \
-  --set build.optimized-compiler-builtins=false \
-  --set rust.llvm-tools=false \
-  --set rust.verify-llvm-ir=true \
+  --set rust.codegen-units-std=1 \
   --enable-extended \
-  --tools=cargo,clippy,rust-analyzer,rustdoc,rustfmt,src \
+  --tools=analysis,cargo,clippy,rls,rustfmt,src \
   --enable-vendor \
   --enable-verbose-tests \
+  %{?set_wasi_root} \
+  --dist-compression-formats=gz \
   --release-channel=%{channel} \
   --release-description="%{?fedora:Fedora }%{?rhel:Red Hat }%{version}-%{release}"
 
-%global __x %{__python3} ./x.py
+%{python} ./x.py build -j "$ncpus" --stage 2
+%{python} ./x.py doc --stage 2
 
-%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
-# Finalize the profile data and clean up the raw files
-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}"
+%if %defined cross_targets
+for triple in %{cross_targets}; do
+  %{python} ./x.py build --stage 2 --target=$triple std
+done
 %endif
 
-# Build the compiler normally (with or without PGO)
-%{__x} build sysroot
-
-# Build everything else normally
-%{__x} build
-%{__x} doc
-
-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}
-%endif
-%{export_rust_env}
+export %{rust_env}
 
-DESTDIR=%{buildroot} %{__x} install
+DESTDIR=%{buildroot} %{python} ./x.py install
 
-for triple in %{?all_targets} ; do
-  DESTDIR=%{buildroot} %{__x} install --target=$triple std
+%if %defined cross_targets
+for triple in %{cross_targets}; do
+  DESTDIR=%{buildroot} %{python} ./x.py install --target=$triple std
 done
+%endif
 
 # These are transient files used by x.py dist and install
 rm -rf ./build/dist/ ./build/tmp/
 
-# Some of the components duplicate-install binaries, leaving backups we don't want
-rm -f %{buildroot}%{_bindir}/*.old
-
-# Make sure the compiler's shared libraries are in the proper libdir
+# Make sure the shared libraries are in the proper libdir
 %if "%{_libdir}" != "%{common_libdir}"
 mkdir -p %{buildroot}%{_libdir}
 find %{buildroot}%{common_libdir} -maxdepth 1 -type f -name '*.so' \
@@ -977,12 +660,18 @@ find %{buildroot}%{common_libdir} -maxdepth 1 -type f -name '*.so' \
 find %{buildroot}%{_libdir} -maxdepth 1 -type f -name '*.so' \
   -exec chmod -v +x '{}' '+'
 
-# The shared standard library is excluded from Provides, because it has no
-# stable ABI. However, we still ship it alongside the static target libraries
-# to enable some niche local use-cases, like the `evcxr` REPL.
-# Make sure those libraries are also executable for debuginfo extraction.
-find %{buildroot}%{rustlibdir} -type f -name '*.so' \
-  -exec chmod -v +x '{}' '+'
+# The libdir libraries are identical to those under rustlib/.  It's easier on
+# library loading if we keep them in libdir, but we do need them in rustlib/
+# to support dynamic linking for compiler plugins, so we'll symlink.
+(cd "%{buildroot}%{rustlibdir}/%{rust_triple}/lib" &&
+ find ../../../../%{_lib} -maxdepth 1 -name '*.so' |
+ while read lib; do
+   if [ -f "${lib##*/}" ]; then
+     # make sure they're actually identical!
+     cmp "$lib" "${lib##*/}"
+     ln -v -f -s -t . "$lib"
+   fi
+ done)
 
 # Remove installer artifacts (manifests, uninstall scripts, etc.)
 find %{buildroot}%{rustlibdir} -maxdepth 1 -type f -exec rm -v '{}' '+'
@@ -994,18 +683,21 @@ find %{buildroot}%{rustlibdir} -type f -name '*.orig' -exec rm -v '{}' '+'
 # We don't actually need to ship any of those python scripts in rust-src anyway.
 find %{buildroot}%{rustlibdir}/src -type f -name '*.py' -exec rm -v '{}' '+'
 
+# FIXME: __os_install_post will strip the rlibs
+# -- should we find a way to preserve debuginfo?
+
 # Remove unwanted documentation files (we already package them)
-rm -f %{buildroot}%{_pkgdocdir}/README.md
-rm -f %{buildroot}%{_pkgdocdir}/COPYRIGHT
-rm -f %{buildroot}%{_pkgdocdir}/LICENSE
-rm -f %{buildroot}%{_pkgdocdir}/LICENSE-APACHE
-rm -f %{buildroot}%{_pkgdocdir}/LICENSE-MIT
-rm -f %{buildroot}%{_pkgdocdir}/LICENSE-THIRD-PARTY
-rm -f %{buildroot}%{_pkgdocdir}/*.old
+rm -f %{buildroot}%{_docdir}/%{name}/README.md
+rm -f %{buildroot}%{_docdir}/%{name}/COPYRIGHT
+rm -f %{buildroot}%{_docdir}/%{name}/LICENSE
+rm -f %{buildroot}%{_docdir}/%{name}/LICENSE-APACHE
+rm -f %{buildroot}%{_docdir}/%{name}/LICENSE-MIT
+rm -f %{buildroot}%{_docdir}/%{name}/LICENSE-THIRD-PARTY
+rm -f %{buildroot}%{_docdir}/%{name}/*.old
 
 # Sanitize the HTML documentation
-find %{buildroot}%{_pkgdocdir}/html -empty -delete
-find %{buildroot}%{_pkgdocdir}/html -type f -exec chmod -x '{}' '+'
+find %{buildroot}%{_docdir}/%{name}/html -empty -delete
+find %{buildroot}%{_docdir}/%{name}/html -type f -exec chmod -x '{}' '+'
 
 # Create the path for crate-devel packages
 mkdir -p %{buildroot}%{_datadir}/cargo/registry
@@ -1015,87 +707,39 @@ mkdir -p %{buildroot}%{_datadir}/cargo/registry
 mkdir -p %{buildroot}%{_docdir}/cargo
 ln -sT ../rust/html/cargo/ %{buildroot}%{_docdir}/cargo/html
 
+%if %without lldb
+rm -f %{buildroot}%{_bindir}/rust-lldb
+rm -f %{buildroot}%{rustlibdir}/etc/lldb_*
+%endif
+
 # We don't want Rust copies of LLVM tools (rust-lld, rust-llvm-dwp)
 rm -f %{buildroot}%{rustlibdir}/%{rust_triple}/bin/rust-ll*
 
-%if 0%{?rhel}
-# This allows users to build packages using Rust Toolset.
-%{__install} -D -m 644 %{S:100} %{buildroot}%{rpmmacrodir}/macros.rust-toolset
-%{__install} -D -m 644 %{S:101} %{buildroot}%{rpmmacrodir}/macros.rust-srpm
-%{__install} -D -m 644 %{S:102} %{buildroot}%{_fileattrsdir}/cargo_vendor.attr
-%{__install} -D -m 755 %{S:103} %{buildroot}%{_rpmconfigdir}/cargo_vendor.prov
-%endif
-
 
 %check
-%if 0%{?rhel} && 0%{?rhel} <= 9
-%{?set_build_flags}
-%endif
-%{export_rust_env}
+export %{rust_env}
 
 # Sanity-check the installed binaries, debuginfo-stripped and all.
-TMP_HELLO=$(mktemp -d)
-(
-  cd "$TMP_HELLO"
-  export RUSTC=%{buildroot}%{_bindir}/rustc \
-    LD_LIBRARY_PATH="%{buildroot}%{_libdir}:$LD_LIBRARY_PATH"
-  %{buildroot}%{_bindir}/cargo init --name hello-world
-  %{buildroot}%{_bindir}/cargo run --verbose
-
-  # Sanity-check that code-coverage builds and runs
-  env RUSTFLAGS="-Cinstrument-coverage" %{buildroot}%{_bindir}/cargo run --verbose
-  test -r default_*.profraw
-
-  # Try a build sanity-check for other std-enabled targets
-  for triple in %{?mingw_targets} %{?wasm_targets}; do
-    %{buildroot}%{_bindir}/cargo build --verbose --target=$triple
-  done
-)
-rm -rf "$TMP_HELLO"
+%{buildroot}%{_bindir}/cargo new build/hello-world
+env RUSTC=%{buildroot}%{_bindir}/rustc \
+    LD_LIBRARY_PATH="%{buildroot}%{_libdir}:$LD_LIBRARY_PATH" \
+    %{buildroot}%{_bindir}/cargo run --manifest-path build/hello-world/Cargo.toml
 
 # The results are not stable on koji, so mask errors and just log it.
 # Some of the larger test artifacts are manually cleaned to save space.
-
-# - Bootstrap is excluded because it's not something we ship, and a lot of its
-#   tests are geared toward the upstream CI environment.
-# - 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} || :
+%{python} ./x.py test --no-fail-fast --stage 2 || :
 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
-%endif
-%if %with disabled_libssh2
-# 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
-%{__x} test --no-fail-fast cargo %{?cargo_test_skip} || :
+%{python} ./x.py test --no-fail-fast --stage 2 cargo || :
 rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 
-%{__x} test --no-fail-fast clippy || :
+%{python} ./x.py test --no-fail-fast --stage 2 clippy || :
 
-%{__x} test --no-fail-fast rust-analyzer || :
+env RLS_TEST_WAIT_FOR_AGES=1 \
+%{python} ./x.py test --no-fail-fast --stage 2 rls || :
+
+%{python} ./x.py test --no-fail-fast --stage 2 rustfmt || :
 
-%{__x} test --no-fail-fast rustfmt || :
 
 %ldconfig_scriptlets
 
@@ -1105,14 +749,13 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 %doc README.md
 %{_bindir}/rustc
 %{_bindir}/rustdoc
-%{_libdir}/librustc_driver-*.so
-%{_libexecdir}/rust-analyzer-proc-macro-srv
+%{_libdir}/*.so
 %{_mandir}/man1/rustc.1*
 %{_mandir}/man1/rustdoc.1*
-%license build/manifests/rustc/cargo-vendor.txt
-%license %{_pkgdocdir}/COPYRIGHT.html
-%license %{_pkgdocdir}/licenses/
-%exclude %{_sysconfdir}/target-spec-json-schema.json
+%dir %{rustlibdir}
+%dir %{rustlibdir}/%{rust_triple}
+%dir %{rustlibdir}/%{rust_triple}/lib
+%{rustlibdir}/%{rust_triple}/lib/*.so
 
 
 %files std-static
@@ -1120,59 +763,32 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 %dir %{rustlibdir}/%{rust_triple}
 %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
 
-%if %target_enabled i686-pc-windows-gnu
-%target_files i686-pc-windows-gnu
-%{rustlibdir}/i686-pc-windows-gnu/lib/rs*.o
-%exclude %{rustlibdir}/i686-pc-windows-gnu/lib/*.dll
-%exclude %{rustlibdir}/i686-pc-windows-gnu/lib/*.dll.a
+%if %defined cross_targets
+%{lua: do
+  for triple in string.gmatch(rpm.expand("%{cross_targets}"), "%S+") do
+    local subs = {
+      triple = triple,
+      rustlibdir = rpm.expand("%{rustlibdir}"),
+      wasi = string.find(triple, "-wasi") and 1 or 0,
+    }
+    local s = string.gsub([[
+
+%files std-static-{{triple}}
+%dir {{rustlibdir}}
+%dir {{rustlibdir}}/{{triple}}
+%dir {{rustlibdir}}/{{triple}}/lib
+{{rustlibdir}}/{{triple}}/lib/*.rlib
+%if {{wasi}}
+%dir {{rustlibdir}}/{{triple}}/lib/self-contained
+{{rustlibdir}}/{{triple}}/lib/self-contained/crt*.o
 %endif
 
-%if %target_enabled x86_64-pc-windows-gnu
-%target_files x86_64-pc-windows-gnu
-%{rustlibdir}/x86_64-pc-windows-gnu/lib/rs*.o
-%exclude %{rustlibdir}/x86_64-pc-windows-gnu/lib/*.dll
-%exclude %{rustlibdir}/x86_64-pc-windows-gnu/lib/*.dll.a
-%endif
-
-%if %target_enabled wasm32-unknown-unknown
-%target_files wasm32-unknown-unknown
-%endif
-
-%if %target_enabled wasm32-wasip1
-%target_files wasm32-wasip1
-%if %with bundled_wasi_libc
-%dir %{rustlibdir}/wasm32-wasip1/lib/self-contained
-%{rustlibdir}/wasm32-wasip1/lib/self-contained/crt*.o
-%{rustlibdir}/wasm32-wasip1/lib/self-contained/libc.a
-%endif
-%endif
-
-%if %target_enabled x86_64-unknown-none
-%target_files x86_64-unknown-none
-%endif
-
-%if %target_enabled aarch64-unknown-uefi
-%target_files aarch64-unknown-uefi
-%endif
-
-%if %target_enabled x86_64-unknown-uefi
-%target_files x86_64-unknown-uefi
-%endif
-
-%if %target_enabled aarch64-unknown-none-softfloat
-%target_files aarch64-unknown-none-softfloat
+]], "{{(%w+)}}", subs)
+    print(s)
+  end
+end}
 %endif
 
 
@@ -1188,31 +804,45 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 %exclude %{_bindir}/rust-gdbgui
 
 
+%if %with lldb
 %files lldb
 %{_bindir}/rust-lldb
 %{rustlibdir}/etc/lldb_*
+%endif
 
 
 %files doc
-%docdir %{_pkgdocdir}
-%dir %{_pkgdocdir}
-%{_pkgdocdir}/html
-# former cargo-doc
-%docdir %{_docdir}/cargo
-%dir %{_docdir}/cargo
-%{_docdir}/cargo/html
+%docdir %{_docdir}/%{name}
+%dir %{_docdir}/%{name}
+%dir %{_docdir}/%{name}/html
+%{_docdir}/%{name}/html/*/
+%{_docdir}/%{name}/html/*.html
+%{_docdir}/%{name}/html/*.css
+%{_docdir}/%{name}/html/*.js
+%{_docdir}/%{name}/html/*.png
+%{_docdir}/%{name}/html/*.svg
+%{_docdir}/%{name}/html/*.woff
+%{_docdir}/%{name}/html/*.woff2
+%license %{_docdir}/%{name}/html/*.txt
+%license %{_docdir}/%{name}/html/*.md
 
 
 %files -n cargo
-%license src/tools/cargo/LICENSE-{APACHE,MIT,THIRD-PARTY}
+%license src/tools/cargo/LICENSE-APACHE src/tools/cargo/LICENSE-MIT src/tools/cargo/LICENSE-THIRD-PARTY
 %doc src/tools/cargo/README.md
 %{_bindir}/cargo
+%{_libexecdir}/cargo*
 %{_mandir}/man1/cargo*.1*
 %{_sysconfdir}/bash_completion.d/cargo
 %{_datadir}/zsh/site-functions/_cargo
 %dir %{_datadir}/cargo
 %dir %{_datadir}/cargo/registry
-%license build/manifests/cargo/cargo-vendor.txt
+
+
+%files -n cargo-doc
+%docdir %{_docdir}/cargo
+%dir %{_docdir}/cargo
+%{_docdir}/cargo/html
 
 
 %files -n rustfmt
@@ -1220,14 +850,12 @@ 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}/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 rls
+%{_bindir}/rls
+%doc src/tools/rls/{README.md,COPYRIGHT,debugging.md}
+%license src/tools/rls/LICENSE-{APACHE,MIT}
 
 
 %files -n clippy
@@ -1235,7 +863,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
@@ -1243,16 +870,433 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 %{rustlibdir}/src
 
 
-%if 0%{?rhel}
-%files toolset-srpm-macros
-%{rpmmacrodir}/macros.rust-srpm
-
-%files toolset
-%{rpmmacrodir}/macros.rust-toolset
-%{_fileattrsdir}/cargo_vendor.attr
-%{_rpmconfigdir}/cargo_vendor.prov
-%endif
+%files analysis
+%{rustlibdir}/%{rust_triple}/analysis/
 
 
 %changelog
-%autochangelog
+* Mon Nov 29 2021 Josh Stone  - 1.57.0~beta.8-1
+- beta test
+- Backport rust#91070, fixes rhbz#1990657
+- Add rust-std-static-wasm32-wasi
+
+* Sun Nov 28 2021 Igor Raits  - 1.56.1-3
+- De-bootstrap (libgit2)
+
+* Sun Nov 28 2021 Igor Raits  - 1.56.1-2
+- Rebuild for libgit2 1.3.x
+
+* Mon Nov 01 2021 Josh Stone  - 1.56.1-1
+- Update to 1.56.1.
+
+* Thu Oct 21 2021 Josh Stone  - 1.56.0-1
+- Update to 1.56.0.
+
+* Tue Sep 14 2021 Sahana Prasad  - 1.55.0-2
+- Rebuilt with OpenSSL 3.0.0
+
+* Thu Sep 09 2021 Josh Stone  - 1.55.0-1
+- Update to 1.55.0.
+- Use llvm-ranlib for wasm rlibs; Fixes rhbz#2002612
+
+* Tue Aug 24 2021 Josh Stone  - 1.54.0-2
+- Build with LLVM 12 on Fedora 35+
+
+* Thu Jul 29 2021 Josh Stone  - 1.54.0-1
+- Update to 1.54.0.
+
+* Fri Jul 23 2021 Fedora Release Engineering  - 1.53.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jul 08 2021 Josh Stone  - 1.53.0-2
+- Exclude wasm on s390x for lack of lld
+
+* Thu Jun 17 2021 Josh Stone  - 1.53.0-1
+- Update to 1.53.0.
+
+* Wed Jun 02 2021 Josh Stone  - 1.52.1-2
+- Set rust.codegen-units-std=1 for all targets again.
+- Add rust-std-static-wasm32-unknown-unknown.
+- Rebuild f34 with LLVM 12.
+
+* Mon May 10 2021 Josh Stone  - 1.52.1-1
+- Update to 1.52.1.
+
+* Thu May 06 2021 Josh Stone  - 1.52.0-1
+- Update to 1.52.0.
+
+* Fri Apr 16 2021 Josh Stone  - 1.51.0-3
+- Security fixes for CVE-2020-36323, CVE-2021-31162
+
+* Wed Apr 14 2021 Josh Stone  - 1.51.0-2
+- Security fixes for CVE-2021-28876, CVE-2021-28878, CVE-2021-28879
+- Fix bootstrap for stage0 rust 1.51
+
+* Thu Mar 25 2021 Josh Stone  - 1.51.0-1
+- Update to 1.51.0.
+
+* Thu Feb 11 2021 Josh Stone  - 1.50.0-1
+- Update to 1.50.0.
+
+* Wed Jan 27 2021 Fedora Release Engineering  - 1.49.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 05 2021 Josh Stone  - 1.49.0-1
+- Update to 1.49.0.
+
+* Tue Dec 29 2020 Igor Raits  - 1.48.0-3
+- De-bootstrap
+
+* Mon Dec 28 2020 Igor Raits  - 1.48.0-2
+- Rebuild for libgit2 1.1.x
+
+* Thu Nov 19 2020 Josh Stone  - 1.48.0-1
+- Update to 1.48.0.
+
+* Sat Oct 10 2020 Jeff Law  - 1.47.0-2
+- Re-enable LTO
+
+* Thu Oct 08 2020 Josh Stone  - 1.47.0-1
+- Update to 1.47.0.
+
+* Fri Aug 28 2020 Fabio Valentini  - 1.46.0-2
+- Fix LTO with doctests (backported cargo PR#8657).
+
+* Thu Aug 27 2020 Josh Stone  - 1.46.0-1
+- Update to 1.46.0.
+
+* Mon Aug 03 2020 Josh Stone  - 1.45.2-1
+- Update to 1.45.2.
+
+* Thu Jul 30 2020 Josh Stone  - 1.45.1-1
+- Update to 1.45.1.
+
+* Wed Jul 29 2020 Fedora Release Engineering  - 1.45.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jul 16 2020 Josh Stone  - 1.45.0-1
+- Update to 1.45.0.
+
+* Wed Jul 01 2020 Jeff Law  - 1.44.1-2
+- Disable LTO
+
+* Thu Jun 18 2020 Josh Stone  - 1.44.1-1
+- Update to 1.44.1.
+
+* Thu Jun 04 2020 Josh Stone  - 1.44.0-1
+- Update to 1.44.0.
+
+* Thu May 07 2020 Josh Stone  - 1.43.1-1
+- Update to 1.43.1.
+
+* Thu Apr 23 2020 Josh Stone  - 1.43.0-1
+- Update to 1.43.0.
+
+* Thu Mar 12 2020 Josh Stone  - 1.42.0-1
+- Update to 1.42.0.
+
+* Thu Feb 27 2020 Josh Stone  - 1.41.1-1
+- Update to 1.41.1.
+
+* Thu Feb 20 2020 Josh Stone  - 1.41.0-2
+- Rebuild with llvm9.0
+
+* Thu Jan 30 2020 Josh Stone  - 1.41.0-1
+- Update to 1.41.0.
+
+* Thu Jan 16 2020 Josh Stone  - 1.40.0-3
+- Build compiletest with in-tree libtest
+
+* Tue Jan 07 2020 Josh Stone  - 1.40.0-2
+- Fix compiletest with newer (local-rebuild) libtest
+- Fix ARM EHABI unwinding
+
+* Thu Dec 19 2019 Josh Stone  - 1.40.0-1
+- Update to 1.40.0.
+
+* Tue Nov 12 2019 Josh Stone  - 1.39.0-2
+- Fix a couple build and test issues with rustdoc.
+
+* Thu Nov 07 2019 Josh Stone  - 1.39.0-1
+- Update to 1.39.0.
+
+* Fri Sep 27 2019 Josh Stone  - 1.38.0-2
+- Filter the libraries included in rust-std (rhbz1756487)
+
+* Thu Sep 26 2019 Josh Stone  - 1.38.0-1
+- Update to 1.38.0.
+
+* Thu Aug 15 2019 Josh Stone  - 1.37.0-1
+- Update to 1.37.0.
+
+* Fri Jul 26 2019 Fedora Release Engineering  - 1.36.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jul 04 2019 Josh Stone  - 1.36.0-1
+- Update to 1.36.0.
+
+* Wed May 29 2019 Josh Stone  - 1.35.0-2
+- Fix compiletest for rebuild testing.
+
+* Thu May 23 2019 Josh Stone  - 1.35.0-1
+- Update to 1.35.0.
+
+* Tue May 14 2019 Josh Stone  - 1.34.2-1
+- Update to 1.34.2 -- fixes CVE-2019-12083.
+
+* Tue Apr 30 2019 Josh Stone  - 1.34.1-3
+- Set rust.codegen-units-std=1
+
+* Fri Apr 26 2019 Josh Stone  - 1.34.1-2
+- Remove the ThinLTO workaround.
+
+* Thu Apr 25 2019 Josh Stone  - 1.34.1-1
+- Update to 1.34.1.
+- Add a ThinLTO fix for rhbz1701339.
+
+* Thu Apr 11 2019 Josh Stone  - 1.34.0-1
+- Update to 1.34.0.
+
+* Fri Mar 01 2019 Josh Stone  - 1.33.0-2
+- Fix deprecations for self-rebuild
+
+* Thu Feb 28 2019 Josh Stone  - 1.33.0-1
+- Update to 1.33.0.
+
+* Sat Feb 02 2019 Fedora Release Engineering  - 1.32.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jan 17 2019 Josh Stone  - 1.32.0-1
+- Update to 1.32.0.
+
+* Mon Jan 07 2019 Josh Stone  - 1.31.1-9
+- Update to 1.31.1 for RLS fixes.
+
+* Thu Dec 06 2018 Josh Stone  - 1.31.0-8
+- Update to 1.31.0 -- Rust 2018!
+- clippy/rls/rustfmt are no longer -preview
+
+* Thu Nov 08 2018 Josh Stone  - 1.30.1-7
+- Update to 1.30.1.
+
+* Thu Oct 25 2018 Josh Stone  - 1.30.0-6
+- Update to 1.30.0.
+
+* Mon Oct 22 2018 Josh Stone  - 1.29.2-5
+- Rebuild without bootstrap binaries.
+
+* Sat Oct 20 2018 Josh Stone  - 1.29.2-4
+- Re-bootstrap armv7hl due to rhbz#1639485
+
+* Fri Oct 12 2018 Josh Stone  - 1.29.2-3
+- Update to 1.29.2.
+
+* Tue Sep 25 2018 Josh Stone  - 1.29.1-2
+- Update to 1.29.1.
+- Security fix for str::repeat (pending CVE).
+
+* Thu Sep 13 2018 Josh Stone  - 1.29.0-1
+- Update to 1.29.0.
+- Add a clippy-preview subpackage
+
+* Mon Aug 13 2018 Josh Stone  - 1.28.0-3
+- Use llvm6.0 instead of llvm-7 for now
+
+* Tue Aug 07 2018 Josh Stone  - 1.28.0-2
+- Rebuild for LLVM ppc64/s390x fixes
+
+* Thu Aug 02 2018 Josh Stone  - 1.28.0-1
+- Update to 1.28.0.
+
+* Tue Jul 24 2018 Josh Stone  - 1.27.2-4
+- Update to 1.27.2.
+
+* Sat Jul 14 2018 Fedora Release Engineering  - 1.27.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jul 10 2018 Josh Stone  - 1.27.1-2
+- Update to 1.27.1.
+- Security fix for CVE-2018-1000622
+
+* Thu Jun 21 2018 Josh Stone  - 1.27.0-1
+- Update to 1.27.0.
+
+* Tue Jun 05 2018 Josh Stone  - 1.26.2-4
+- Rebuild without bootstrap binaries.
+
+* Tue Jun 05 2018 Josh Stone  - 1.26.2-3
+- Update to 1.26.2.
+- Re-bootstrap to deal with LLVM symbol changes.
+
+* Tue May 29 2018 Josh Stone  - 1.26.1-2
+- Update to 1.26.1.
+
+* Thu May 10 2018 Josh Stone  - 1.26.0-1
+- Update to 1.26.0.
+
+* Mon Apr 16 2018 Dan Callaghan  - 1.25.0-3
+- Add cargo, rls, and analysis
+
+* Tue Apr 10 2018 Josh Stone  - 1.25.0-2
+- Filter codegen-backends from Provides too.
+
+* Thu Mar 29 2018 Josh Stone  - 1.25.0-1
+- Update to 1.25.0.
+
+* Thu Mar 01 2018 Josh Stone  - 1.24.1-1
+- Update to 1.24.1.
+
+* Wed Feb 21 2018 Josh Stone  - 1.24.0-3
+- Backport a rebuild fix for rust#48308.
+
+* Mon Feb 19 2018 Josh Stone  - 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  - 1.24.0-1
+- Update to 1.24.0.
+
+* Mon Feb 12 2018 Iryna Shcherbina  - 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  - 1.23.0-3
+- Use full-bootstrap to work around a rebuild issue.
+- Patch binaryen for GCC 8
+
+* Thu Feb 01 2018 Igor Gnatenko  - 1.23.0-2
+- Switch to %%ldconfig_scriptlets
+
+* Mon Jan 08 2018 Josh Stone  - 1.23.0-1
+- Update to 1.23.0.
+
+* Thu Nov 23 2017 Josh Stone  - 1.22.1-1
+- Update to 1.22.1.
+
+* Thu Oct 12 2017 Josh Stone  - 1.21.0-1
+- Update to 1.21.0.
+
+* Mon Sep 11 2017 Josh Stone  - 1.20.0-2
+- ABI fixes for ppc64 and s390x.
+
+* Thu Aug 31 2017 Josh Stone  - 1.20.0-1
+- Update to 1.20.0.
+- Add a rust-src subpackage.
+
+* Thu Aug 03 2017 Fedora Release Engineering  - 1.19.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering  - 1.19.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Jul 24 2017 Josh Stone  - 1.19.0-2
+- Use find-debuginfo.sh --keep-section .rustc
+
+* Thu Jul 20 2017 Josh Stone  - 1.19.0-1
+- Update to 1.19.0.
+
+* Thu Jun 08 2017 Josh Stone  - 1.18.0-1
+- Update to 1.18.0.
+
+* Mon May 08 2017 Josh Stone  - 1.17.0-2
+- Move shared libraries back to libdir and symlink in rustlib
+
+* Thu Apr 27 2017 Josh Stone  - 1.17.0-1
+- Update to 1.17.0.
+
+* Mon Mar 20 2017 Josh Stone  - 1.16.0-3
+- Make rust-lldb arch-specific to deal with lldb deps
+
+* Fri Mar 17 2017 Josh Stone  - 1.16.0-2
+- Limit rust-lldb arches
+
+* Thu Mar 16 2017 Josh Stone  - 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  - 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  - 1.14.0-2
+- Rebuild without bootstrap binaries.
+
+* Thu Dec 22 2016 Josh Stone  - 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  - 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  - 1.12.1-1
+- Update to 1.12.1.
+
+* Fri Oct 14 2016 Josh Stone  - 1.12.0-7
+- Rebuild with LLVM 3.9.
+- Add ncurses-devel for llvm-config's -ltinfo.
+
+* Thu Oct 13 2016 Josh Stone  - 1.12.0-6
+- Rebuild with llvm-static, preparing for 3.9
+
+* Fri Oct 07 2016 Josh Stone  - 1.12.0-5
+- Rebuild with fixed eu-strip (rhbz1380961)
+
+* Fri Oct 07 2016 Josh Stone  - 1.12.0-4
+- Rebuild without bootstrap binaries.
+
+* Thu Oct 06 2016 Josh Stone  - 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  - 1.12.0-2
+- Protect .rustc from rpm stripping.
+
+* Fri Sep 30 2016 Josh Stone  - 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  - 1.11.0-3
+- Rebuild without bootstrap binaries.
+
+* Fri Sep 02 2016 Josh Stone  - 1.11.0-2
+- Bootstrap armv7hl, with backported no-neon patch.
+
+* Wed Aug 24 2016 Josh Stone  - 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  1.10.0-4
+- Rebuild without bootstrap binaries.
+
+* Fri Aug 12 2016 Josh Stone  - 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  - 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  - 1.10.0-1
+- Initial package, bootstrapped
diff --git a/rustc-1.56.0-disable-libssh2.patch b/rustc-1.56.0-disable-libssh2.patch
new file mode 100644
index 0000000..4d9331b
--- /dev/null
+++ b/rustc-1.56.0-disable-libssh2.patch
@@ -0,0 +1,42 @@
+--- rustc-1.56.0-src/Cargo.lock.orig	2021-10-18 02:52:36.000000000 -0700
++++ rustc-1.56.0-src/Cargo.lock	2021-10-19 18:00:47.999793566 -0700
+@@ -1895,7 +1895,6 @@
+ dependencies = [
+  "cc",
+  "libc",
+- "libssh2-sys",
+  "libz-sys",
+  "openssl-sys",
+  "pkg-config",
+@@ -1918,20 +1917,6 @@
+ ]
+ 
+ [[package]]
+-name = "libssh2-sys"
+-version = "0.2.19"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ca46220853ba1c512fc82826d0834d87b06bcd3c2a42241b7de72f3d2fe17056"
+-dependencies = [
+- "cc",
+- "libc",
+- "libz-sys",
+- "openssl-sys",
+- "pkg-config",
+- "vcpkg",
+-]
+-
+-[[package]]
+ name = "libz-sys"
+ version = "1.1.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+--- rustc-1.56.0-src/vendor/git2/Cargo.toml.orig	2021-10-18 04:05:54.000000000 -0700
++++ rustc-1.56.0-src/vendor/git2/Cargo.toml	2021-10-19 17:57:37.960500359 -0700
+@@ -52,7 +52,7 @@
+ version = "0.1.39"
+ 
+ [features]
+-default = ["ssh", "https", "ssh_key_from_memory"]
++default = ["https"]
+ https = ["libgit2-sys/https", "openssl-sys", "openssl-probe"]
+ ssh = ["libgit2-sys/ssh"]
+ ssh_key_from_memory = ["libgit2-sys/ssh_key_from_memory"]
diff --git a/rustc-1.57.0-disable-http2.patch b/rustc-1.57.0-disable-http2.patch
new file mode 100644
index 0000000..6723dc6
--- /dev/null
+++ b/rustc-1.57.0-disable-http2.patch
@@ -0,0 +1,66 @@
+--- rustc-beta-src/Cargo.lock.orig	2021-11-29 10:37:40.665228216 -0800
++++ rustc-beta-src/Cargo.lock	2021-11-29 10:37:40.667228175 -0800
+@@ -889,7 +889,6 @@
+ dependencies = [
+  "cc",
+  "libc",
+- "libnghttp2-sys",
+  "libz-sys",
+  "openssl-sys",
+  "pkg-config",
+@@ -1907,16 +1906,6 @@
+ checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
+ 
+ [[package]]
+-name = "libnghttp2-sys"
+-version = "0.1.4+1.41.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "03624ec6df166e79e139a2310ca213283d6b3c30810c54844f307086d4488df1"
+-dependencies = [
+- "cc",
+- "libc",
+-]
+-
+-[[package]]
+ name = "libz-sys"
+ version = "1.1.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2021-11-29 10:37:40.667228175 -0800
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2021-11-29 10:38:41.291987733 -0800
+@@ -25,7 +25,7 @@
+ cargo-util = { path = "crates/cargo-util", version = "0.1.1" }
+ crates-io = { path = "crates/crates-io", version = "0.33.0" }
+ crossbeam-utils = "0.8"
+-curl = { version = "0.4.39", features = ["http2"] }
++curl = { version = "0.4.39", features = [] }
+ curl-sys = "0.4.49"
+ env_logger = "0.9.0"
+ pretty_env_logger = { version = "0.4", optional = true }
+--- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig	2021-11-27 09:38:17.000000000 -0800
++++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs	2021-11-29 10:37:40.667228175 -0800
+@@ -417,14 +417,8 @@
+         // Also note that pipelining is disabled as curl authors have indicated
+         // that it's buggy, and we've empirically seen that it's buggy with HTTP
+         // proxies.
+-        let mut multi = Multi::new();
+-        let multiplexing = config.http_config()?.multiplexing.unwrap_or(true);
+-        multi
+-            .pipelining(false, multiplexing)
+-            .with_context(|| "failed to enable multiplexing/pipelining in curl")?;
+-
+-        // let's not flood crates.io with connections
+-        multi.set_max_host_connections(2)?;
++        let multi = Multi::new();
++        let multiplexing = false;
+ 
+         Ok(PackageSet {
+             packages: package_ids
+@@ -653,7 +647,7 @@
+ macro_rules! try_old_curl {
+     ($e:expr, $msg:expr) => {
+         let result = $e;
+-        if cfg!(target_os = "macos") {
++        if cfg!(any(target_os = "linux", target_os = "macos")) {
+             if let Err(e) = result {
+                 warn!("ignoring libcurl {} error: {}", $msg, e);
+             }
diff --git a/rustc-1.57.0-no-default-pie.patch b/rustc-1.57.0-no-default-pie.patch
new file mode 100644
index 0000000..c9c8693
--- /dev/null
+++ b/rustc-1.57.0-no-default-pie.patch
@@ -0,0 +1,24 @@
+--- rustc-beta-src/compiler/rustc_codegen_ssa/src/back/link.rs.orig	2021-11-29 10:41:02.380100917 -0800
++++ rustc-beta-src/compiler/rustc_codegen_ssa/src/back/link.rs	2021-11-29 10:53:31.014783112 -0800
+@@ -1485,15 +1485,14 @@
+ }
+ 
+ fn link_output_kind(sess: &Session, crate_type: CrateType) -> LinkOutputKind {
+-    let kind = match (crate_type, sess.crt_static(Some(crate_type)), sess.relocation_model()) {
++    // Only use PIE if explicity specified.
++    let explicit_pic =
++        matches!(sess.opts.cg.relocation_model, Some(RelocModel::Pic | RelocModel::Pie));
++    let kind = match (crate_type, sess.crt_static(Some(crate_type)), explicit_pic) {
+         (CrateType::Executable, _, _) if sess.is_wasi_reactor() => LinkOutputKind::WasiReactorExe,
+-        (CrateType::Executable, false, RelocModel::Pic | RelocModel::Pie) => {
+-            LinkOutputKind::DynamicPicExe
+-        }
++        (CrateType::Executable, false, true) => LinkOutputKind::DynamicPicExe,
+         (CrateType::Executable, false, _) => LinkOutputKind::DynamicNoPicExe,
+-        (CrateType::Executable, true, RelocModel::Pic | RelocModel::Pie) => {
+-            LinkOutputKind::StaticPicExe
+-        }
++        (CrateType::Executable, true, true) => LinkOutputKind::StaticPicExe,
+         (CrateType::Executable, true, _) => LinkOutputKind::StaticNoPicExe,
+         (_, true, _) => LinkOutputKind::StaticDylib,
+         (_, false, _) => LinkOutputKind::DynamicDylib,
diff --git a/rustc-1.70.0-rust-gdb-substitute-path.patch b/rustc-1.70.0-rust-gdb-substitute-path.patch
deleted file mode 100644
index e9e5e2e..0000000
--- a/rustc-1.70.0-rust-gdb-substitute-path.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
-index 9abed30ea6f7..e4bf55df3688 100755
---- a/src/etc/rust-gdb
-+++ b/src/etc/rust-gdb
-@@ -13,8 +13,6 @@ fi
- # Find out where the pretty printer Python module is
- RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
- GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
--# Get the commit hash for path remapping
--RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')"
- 
- # Run GDB with the additional arguments that load the pretty printers
- # Set the environment variable `RUST_GDB` to overwrite the call to a
-@@ -23,6 +21,6 @@ RUST_GDB="${RUST_GDB:-gdb}"
- PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" exec ${RUST_GDB} \
-   --directory="$GDB_PYTHON_MODULE_DIRECTORY" \
-   -iex "add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY" \
--  -iex "set substitute-path /rustc/$RUSTC_COMMIT_HASH $RUSTC_SYSROOT/lib/rustlib/src/rust" \
-+  -iex "set substitute-path @BUILDDIR@ $RUSTC_SYSROOT/lib/rustlib/src/rust" \
-   "$@"
-  
diff --git a/rustc-1.92.0-disable-libssh2.patch b/rustc-1.92.0-disable-libssh2.patch
deleted file mode 100644
index a03668f..0000000
--- a/rustc-1.92.0-disable-libssh2.patch
+++ /dev/null
@@ -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-08-16 15:47:14.000000000 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2025-08-18 17:31:39.554771554 -0700
-@@ -2800,7 +2800,6 @@ checksum = "1c42fe03df2bd3c53a3a9c7317ad
- dependencies = [
-  "cc",
-  "libc",
-- "libssh2-sys",
-  "libz-sys",
-  "openssl-sys",
-  "pkg-config",
-@@ -2847,20 +2846,6 @@ dependencies = [
-  "pkg-config",
-  "vcpkg",
- ]
--
--[[package]]
--name = "libssh2-sys"
--version = "0.3.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "220e4f05ad4a218192533b300327f5150e809b54c4ec83b5a1d91833601811b9"
--dependencies = [
-- "cc",
-- "libc",
-- "libz-sys",
-- "openssl-sys",
-- "pkg-config",
-- "vcpkg",
--]
- 
- [[package]]
- name = "libz-rs-sys"
-diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2025-08-16 15:47:14.000000000 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2025-08-18 17:33:02.401743230 -0700
-@@ -46,7 +46,7 @@ curl = "0.4.48"
- curl-sys = "0.4.83"
- filetime = "0.2.26"
- flate2 = { version = "1.1.2", default-features = false, features = ["zlib-rs"] }
--git2 = "0.20.2"
-+git2 = { version = "0.20.2", default-features = false, features = ["https"] }
- git2-curl = "0.21.0"
- # When updating this, also see if `gix-transport` further down needs updating or some auth-related tests will fail.
- gix = { version = "0.73.0", default-features = false, features = ["progress-tree", "parallel", "dirwalk", "status"] }
diff --git a/rustc-1.92.0-unbundle-sqlite.patch b/rustc-1.92.0-unbundle-sqlite.patch
deleted file mode 100644
index fb0b284..0000000
--- a/rustc-1.92.0-unbundle-sqlite.patch
+++ /dev/null
@@ -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" }
diff --git a/sources b/sources
index 682e418..8c268fb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (rustc-1.92.0-src.tar.xz) = a2c0b127933595b9bc2063d7b7c88d9af512c4664b18f29d44c9a6e2c68d194b87a3071717e8f1b7c858ae940baca888e10be95cd31e0201916d0bfc312a3b15
-SHA512 (wasi-libc-wasi-sdk-27.tar.gz) = dfc2c36fabf32f465fc833ed0b10efffc9a35c68162ecc3e8d656d1d684d170b734d55e790614d12d925d17f49d60f0d2d01c46cecac941cf62d68eda84df13e
+SHA512 (rustc-1.56.1-src.tar.xz) = 193468e211cde9ebc5f6e30b8e3733b79bd8710fe6dd45c7ed8d4392f91010d30466787afd4d0b2041cd7dd994924fee8ad111048824e248bd994959e55bf15f
diff --git a/sources-bootstrap b/sources-bootstrap
new file mode 100644
index 0000000..abb7a12
--- /dev/null
+++ b/sources-bootstrap
@@ -0,0 +1,8 @@
+SHA512 (rustc-1.56.1-src.tar.xz) = 193468e211cde9ebc5f6e30b8e3733b79bd8710fe6dd45c7ed8d4392f91010d30466787afd4d0b2041cd7dd994924fee8ad111048824e248bd994959e55bf15f
+SHA512 (rust-1.55.0-aarch64-unknown-linux-gnu.tar.xz) = 223a024701762675adb5c7c59fc54717d23f2ae4ea5984cd1cc0568d39c5207aa07a104ddad68da057f6434eecf23415ae13be2235797897d8d0f7cb5f2fc4b5
+SHA512 (rust-1.55.0-armv7-unknown-linux-gnueabihf.tar.xz) = b06b3c36b5ca35391030f3c9d2f64725263ac987002923d9263c4c27877d91453db3191e01d40c78f439a48f83da220926a2841337d815dd333591d453f2fc0e
+SHA512 (rust-1.55.0-i686-unknown-linux-gnu.tar.xz) = a0222c68c63ddd67afee552dd9ed636ea02fd3f26000deb7a1dc47806a1ec0b2fafaed903d4dabb0fddeb9e4026bf0da8bb2161c14db24d2883c084932e306b6
+SHA512 (rust-1.55.0-powerpc64-unknown-linux-gnu.tar.xz) = 367ddaee0131ae05945b0a81efb73fde479140cb8078d10ec166c0da68afc1fa2aff40a8e6246c2b4861a876b8672a8d8d126bf15d23830c6e170aa27c1d6a7b
+SHA512 (rust-1.55.0-powerpc64le-unknown-linux-gnu.tar.xz) = 67c98c7cc44482082daa5daa3926dc92782b373b3173181413e68d59ea07f6eee61d46f3832a3fce18bdc44dd563e2e1f85709435e04c599b299981ecd932a9f
+SHA512 (rust-1.55.0-s390x-unknown-linux-gnu.tar.xz) = 7fc83c8723493864a470f32a05db9e16ecba0ff621080d8a3a257e6f42a37bfcc8d364d71aff696991dd85635f6596ffa72efdefee1620c308984536b48d212a
+SHA512 (rust-1.55.0-x86_64-unknown-linux-gnu.tar.xz) = 4bc304727b1e9459194a9a9ad5c8e1fe63501f01047d479585de6708365b3f59e09aade64c7f4969df204f8bbcf9de9508745d2b96bc25cb74ed093f8053a4d6
diff --git a/tests/Sanity/basic-smoke/Makefile b/tests/Sanity/basic-smoke/Makefile
new file mode 100644
index 0000000..3293c52
--- /dev/null
+++ b/tests/Sanity/basic-smoke/Makefile
@@ -0,0 +1,63 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /tools/rust/Sanity/basic-smoke
+#   Description: basic-smoke
+#   Author: Martin Cermak 
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2017 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/tools/rust/Sanity/basic-smoke
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Martin Cermak " > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     basic-smoke" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        10m" >> $(METADATA)
+	@echo "RunFor:          rust" >> $(METADATA)
+	@echo "Requires:        rust" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
+
+	rhts-lint $(METADATA)
diff --git a/tests/Sanity/basic-smoke/PURPOSE b/tests/Sanity/basic-smoke/PURPOSE
new file mode 100644
index 0000000..a7455dc
--- /dev/null
+++ b/tests/Sanity/basic-smoke/PURPOSE
@@ -0,0 +1,3 @@
+PURPOSE of /tools/rust/Sanity/basic-smoke
+Description: basic-smoke
+Author: Martin Cermak 
diff --git a/tests/Sanity/basic-smoke/main.fmf b/tests/Sanity/basic-smoke/main.fmf
new file mode 100644
index 0000000..c414d05
--- /dev/null
+++ b/tests/Sanity/basic-smoke/main.fmf
@@ -0,0 +1,13 @@
+summary: basic-smoke
+description: ''
+contact:
+  - Jesus Checa Hidalgo 
+component:
+  - rust
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - rust
+duration: 10m
+extra-summary: /tools/rust/Sanity/basic-smoke
+extra-task: /tools/rust/Sanity/basic-smoke
diff --git a/tests/Sanity/basic-smoke/runtest.sh b/tests/Sanity/basic-smoke/runtest.sh
new file mode 100755
index 0000000..ed25e86
--- /dev/null
+++ b/tests/Sanity/basic-smoke/runtest.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /tools/rust/Sanity/basic-smoke
+#   Description: basic-smoke
+#   Author: Martin Cermak 
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2017 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="$(rpm -qf $(which rustc))"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+        rlRun "pushd $TmpDir"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        HELLO_SRC=$( mktemp )
+        HELLO_BIN=$( mktemp )
+        echo 'fn main() { println!("hello"); }' > $HELLO_SRC
+        rlRun "which rustc"
+        rlRun "rustc -V"
+        rlRun "rustc -o $HELLO_BIN $HELLO_SRC"
+        rlRun "$HELLO_BIN"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
diff --git a/tests/Sanity/build-stratisd/Makefile b/tests/Sanity/build-stratisd/Makefile
new file mode 100644
index 0000000..a085527
--- /dev/null
+++ b/tests/Sanity/build-stratisd/Makefile
@@ -0,0 +1,63 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /tools/rust/Sanity/build-stratisd
+#   Description: rpmbuild stratisd
+#   Author: Edjunior Machado 
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2018 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/tools/rust/Sanity/build-stratisd
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Edjunior Machado " > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     rpmbuild stratisd" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        1h" >> $(METADATA)
+	@echo "RunFor:          rust" >> $(METADATA)
+	@echo "Requires:        rust rpm-build yum-utils stratisd" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Releases:        RHEL8 RHEL9" >> $(METADATA)
+
+	rhts-lint $(METADATA)
diff --git a/tests/Sanity/build-stratisd/PURPOSE b/tests/Sanity/build-stratisd/PURPOSE
new file mode 100644
index 0000000..c790991
--- /dev/null
+++ b/tests/Sanity/build-stratisd/PURPOSE
@@ -0,0 +1,3 @@
+PURPOSE of /tools/rust/Sanity/build-stratisd
+Description: rpmbuild stratisd
+Author: Edjunior Machado 
diff --git a/tests/Sanity/build-stratisd/main.fmf b/tests/Sanity/build-stratisd/main.fmf
new file mode 100644
index 0000000..0617757
--- /dev/null
+++ b/tests/Sanity/build-stratisd/main.fmf
@@ -0,0 +1,17 @@
+summary: rpmbuild stratisd
+description:
+  - 'Ensure that rust does not break stratisd rpmbuild'
+contact:
+  - Jesus Checa Hidalgo 
+component:
+  - rust
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - rust
+  - rpm-build
+  - yum-utils
+  - stratisd
+duration: 1h
+extra-summary: /tools/rust/Sanity/build-stratisd
+extra-task: /tools/rust/Sanity/build-stratisd
diff --git a/tests/Sanity/build-stratisd/runtest.sh b/tests/Sanity/build-stratisd/runtest.sh
new file mode 100755
index 0000000..693a72f
--- /dev/null
+++ b/tests/Sanity/build-stratisd/runtest.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /tools/rust/Sanity/build-stratisd
+#   Description: rpmbuild stratisd
+#   Author: Edjunior Machado 
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2018 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="$(rpm -qf $(which rustc))"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE || rlDie "rustc not found. Aborting testcase..."
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+        rlRun "pushd $TmpDir"
+    rlPhaseEnd
+
+    PKG_TO_BUILD=stratisd
+    rlPhaseStart FAIL ${PKG_TO_BUILD}FetchSrcAndInstallBuildDeps
+        if ! rlCheckRpm $PKG_TO_BUILD; then
+            rlRun "yum install -y $PKG_TO_BUILD"
+            rlAssertRpm $PKG_TO_BUILD
+        fi
+        rlFetchSrcForInstalled $PKG_TO_BUILD
+        rlRun SRPM=$(ls -1 ${PKG_TO_BUILD}*src.rpm)
+        rlRun "rpm -ivh $SRPM"
+        rlRun SPECDIR="$(rpm -E '%{_specdir}')"
+
+        rlRun "yum-builddep -y ${SRPM}"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        set -o pipefail
+        rlRun "rpmbuild -bb ${SPECDIR}/${PKG_TO_BUILD}.spec |& tee ${SRPM}_rpmbuild.log"
+        rlFileSubmit "${SRPM}_rpmbuild.log"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
diff --git a/tests/Sanity/rpmbuild-librsvg2/Makefile b/tests/Sanity/rpmbuild-librsvg2/Makefile
new file mode 100644
index 0000000..bd22601
--- /dev/null
+++ b/tests/Sanity/rpmbuild-librsvg2/Makefile
@@ -0,0 +1,65 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /tools/rust/Sanity/rpmbuild-librsvg2
+#   Description: rpmbuild librsvg2
+#   Author: Edjunior Machado 
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2018 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/tools/rust/Sanity/rpmbuild-librsvg2
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Edjunior Machado " > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     rpmbuild librsvg2" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        1h" >> $(METADATA)
+	@echo "RunFor:          rust" >> $(METADATA)
+	# Due to bz1980717 librsvg2 requires git to build the srpm, but it's missing
+	# from the BuildRequires
+	@echo "Requires:        rust rpm-build yum-utils librsvg2 git" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Releases:        RHEL8 RHEL9" >> $(METADATA)
+
+	rhts-lint $(METADATA)
diff --git a/tests/Sanity/rpmbuild-librsvg2/PURPOSE b/tests/Sanity/rpmbuild-librsvg2/PURPOSE
new file mode 100644
index 0000000..d3a05af
--- /dev/null
+++ b/tests/Sanity/rpmbuild-librsvg2/PURPOSE
@@ -0,0 +1,3 @@
+PURPOSE of /tools/rust/Sanity/rpmbuild-librsvg2
+Description: rpmbuild librsvg2
+Author: Edjunior Machado 
diff --git a/tests/Sanity/rpmbuild-librsvg2/main.fmf b/tests/Sanity/rpmbuild-librsvg2/main.fmf
new file mode 100644
index 0000000..decb64d
--- /dev/null
+++ b/tests/Sanity/rpmbuild-librsvg2/main.fmf
@@ -0,0 +1,18 @@
+summary: rpmbuild librsvg2
+description:
+  - 'Ensure that rust does not break librsvg2 rpmbuild'
+contact:
+  - Jesus Checa Hidalgo 
+component:
+  - rust
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - rust
+  - rpm-build
+  - yum-utils
+  - librsvg2
+  - git
+duration: 1h
+extra-summary: /tools/rust/Sanity/rpmbuild-librsvg2
+extra-task: /tools/rust/Sanity/rpmbuild-librsvg2
diff --git a/tests/Sanity/rpmbuild-librsvg2/runtest.sh b/tests/Sanity/rpmbuild-librsvg2/runtest.sh
new file mode 100755
index 0000000..8965c9e
--- /dev/null
+++ b/tests/Sanity/rpmbuild-librsvg2/runtest.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /tools/rust/Sanity/rpmbuild-librsvg2
+#   Description: rpmbuild librsvg2
+#   Author: Edjunior Machado 
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2018 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="$(rpm -qf $(which rustc))"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE || rlDie "rustc not found. Aborting testcase..."
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+        rlRun "pushd $TmpDir"
+    rlPhaseEnd
+
+    PKG_TO_BUILD=librsvg2
+    rlPhaseStart FAIL ${PKG_TO_BUILD}FetchSrcAndInstallBuildDeps
+        if ! rlCheckRpm $PKG_TO_BUILD; then
+            rlRun "yum install -y $PKG_TO_BUILD ${YUM_SWITCHES}"
+            rlAssertRpm $PKG_TO_BUILD
+        fi
+        rlFetchSrcForInstalled $PKG_TO_BUILD
+        rlRun SRPM=$(ls -1 ${PKG_TO_BUILD}*src.rpm)
+        rlRun "rpm -ivh $SRPM"
+        rlRun SPECDIR="$(rpm -E '%{_specdir}')"
+
+        rlRun "yum-builddep -y ${SPECDIR}/${PKG_TO_BUILD}.spec ${YUM_SWITCHES}"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        set -o pipefail
+        rlRun "rpmbuild -bb ${SPECDIR}/${PKG_TO_BUILD}.spec |& tee ${SRPM}_rpmbuild.log"
+        rlFileSubmit "${SRPM}_rpmbuild.log"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
diff --git a/tests/Sanity/rust-wasm-smoke-test/Makefile b/tests/Sanity/rust-wasm-smoke-test/Makefile
new file mode 100644
index 0000000..437da6b
--- /dev/null
+++ b/tests/Sanity/rust-wasm-smoke-test/Makefile
@@ -0,0 +1,64 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /tools/rust/Sanity/rust-wasm-smoke-test
+#   Description: Test that the rust wasm target is enabled and can compile correctly
+#   Author: Jesus Checa 
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2021 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/tools/rust/Sanity/rust-wasm-smoke-test
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE lib.rs test.js
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Jesus Checa " > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Test that the rust wasm target is enabled and can compile correctly" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        5m" >> $(METADATA)
+	@echo "RunFor:          rust" >> $(METADATA)
+	@echo "Requires:        rust rust-std-static-wasm32-unknown-unknown nodejs" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5 -RHEL7" >> $(METADATA)
+	@echo "Architectures:   aarch64 ppc64le x86_64" >> $(METADATA)
+
+	rhts-lint $(METADATA)
diff --git a/tests/Sanity/rust-wasm-smoke-test/PURPOSE b/tests/Sanity/rust-wasm-smoke-test/PURPOSE
new file mode 100644
index 0000000..e21d668
--- /dev/null
+++ b/tests/Sanity/rust-wasm-smoke-test/PURPOSE
@@ -0,0 +1,3 @@
+PURPOSE of /tools/rust/Sanity/rust-wasm-smoke-test
+Description: Test that the rust wasm target is enabled and can compile correctly
+Author: Jesus Checa 
diff --git a/tests/Sanity/rust-wasm-smoke-test/lib.rs b/tests/Sanity/rust-wasm-smoke-test/lib.rs
new file mode 100644
index 0000000..36e7457
--- /dev/null
+++ b/tests/Sanity/rust-wasm-smoke-test/lib.rs
@@ -0,0 +1,12 @@
+#[no_mangle]
+pub fn fib(index: u32) -> u32 {
+    let mut nminus2;
+    let mut nminus1 = 1;
+    let mut n = 0;
+    for _ in 0..index {
+        nminus2 = nminus1;
+        nminus1 = n;
+        n = nminus2 + nminus1;
+    }
+    n
+}
diff --git a/tests/Sanity/rust-wasm-smoke-test/main.fmf b/tests/Sanity/rust-wasm-smoke-test/main.fmf
new file mode 100644
index 0000000..0fe807c
--- /dev/null
+++ b/tests/Sanity/rust-wasm-smoke-test/main.fmf
@@ -0,0 +1,15 @@
+summary: Test that the rust wasm target is enabled and can compile correctly
+description: ''
+contact:
+  - Jesus Checa 
+component:
+  - rust
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - rust
+  - rust-std-static-wasm32-unknown-unknown
+  - nodejs
+duration: 5m
+extra-summary: /tools/rust/Sanity/rust-wasm-smoke-test
+extra-task: /tools/rust/Sanity/rust-wasm-smoke-test
diff --git a/tests/Sanity/rust-wasm-smoke-test/runtest.sh b/tests/Sanity/rust-wasm-smoke-test/runtest.sh
new file mode 100755
index 0000000..bee4890
--- /dev/null
+++ b/tests/Sanity/rust-wasm-smoke-test/runtest.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /tools/rust/Sanity/rust-wasm-smoke-test
+#   Description: Test that the rust wasm target is enabled and can compile correctly
+#   Author: Jesus Checa 
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2021 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGES="$(rpm -qf $(which rustc)) rust-std-static-wasm32-unknown-unknown"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm --all
+        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+        rlRun "cp lib.rs $TmpDir"
+        rlRun "cp test.js $TmpDir"
+        rlRun "pushd $TmpDir"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        rlRun "rustc --target wasm32-unknown-unknown --crate-type=cdylib lib.rs -o fib.wasm" 0 "Building WASM binary"
+        rlRun "node test.js" 0 "Testing WASM binary"
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
+
diff --git a/tests/Sanity/rust-wasm-smoke-test/test.js b/tests/Sanity/rust-wasm-smoke-test/test.js
new file mode 100644
index 0000000..921df38
--- /dev/null
+++ b/tests/Sanity/rust-wasm-smoke-test/test.js
@@ -0,0 +1,28 @@
+function js_fibonacci(index) {
+    let nminus2 = 0;
+    let nminus1 = 1;
+    let n = 0;
+    for(let i = 0; i < index; ++i) {
+        nminus2 = nminus1;
+        nminus1 = n;
+        n = nminus1 + nminus2;
+    }
+    return n;
+}
+
+const fs = require('fs');
+const buf = fs.readFileSync('./fib.wasm');
+const lib = WebAssembly.instantiate(new Uint8Array(buf)).
+    then(res => {
+        var fib = res.instance.exports.fib;
+        for (var i=1; i<=10; i++) {
+            if(fib(i) != js_fibonacci(i)){
+                console.log("Mismatch between wasm and JS functions");
+                process.exit(1);
+            }
+        }
+    }).catch(e => {
+        console.log(e);
+        process.exit(1);
+    }
+);