.gitignore

@@ -1,2 +1,2 @@
-SOURCES/rustc-1.79.0-src.tar.xz
-SOURCES/wasi-libc-wasi-sdk-22.tar.gz
+SOURCES/rustc-1.75.0-src.tar.xz
+SOURCES/wasi-libc-bd950eb128bff337153de217b11270f948d04bb4.tar.gz

.rust.metadata

@@ -1,2 +1,2 @@
-fdd94a3bdb321d18a0021d4dce9b8546a1db2eec SOURCES/rustc-1.79.0-src.tar.xz
-13451249ddb71e69f12565ef4803b71ce4092191 SOURCES/wasi-libc-wasi-sdk-22.tar.gz
+9ad7bb54dc9572c103b855cdcc823addbb34d15d SOURCES/rustc-1.75.0-src.tar.xz
+55eaa32c99cc8ec970f2db2d340a605724589f9b SOURCES/wasi-libc-bd950eb128bff337153de217b11270f948d04bb4.tar.gz

SOURCES/0001-Disable-jump-threading-of-float-equality.patch

@@ -1,212 +0,0 @@
-From 49166c7dd925244f631277b4aa9ae4233f300884 Mon Sep 17 00:00:00 2001
-From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com>
-Date: Sat, 27 Jul 2024 15:08:11 +0200
-Subject: [PATCH] Disable jump threading of float equality
-
-Jump threading stores values as `u128` (`ScalarInt`) and does its
-comparisons for equality as integer comparisons.
-This works great for integers. Sadly, not everything is an integer.
-
-Floats famously have wonky equality semantcs, with `NaN!=NaN` and
-`0.0 == -0.0`. This does not match our beautiful integer bitpattern
-equality and therefore causes things to go horribly wrong.
-
-While jump threading could be extended to support floats by remembering
-that they're floats in the value state and handling them properly,
-it's signficantly easier to just disable it for now.
-
-(cherry picked from commit eca0a7e72346ba123ace318a0f9c28c57d990aeb)
----
- .../rustc_mir_transform/src/jump_threading.rs |  7 +++
- ...ding.floats.JumpThreading.panic-abort.diff | 59 +++++++++++++++++++
- ...ing.floats.JumpThreading.panic-unwind.diff | 59 +++++++++++++++++++
- tests/mir-opt/jump_threading.rs               | 12 ++++
- 4 files changed, 137 insertions(+)
- create mode 100644 tests/mir-opt/jump_threading.floats.JumpThreading.panic-abort.diff
- create mode 100644 tests/mir-opt/jump_threading.floats.JumpThreading.panic-unwind.diff
-
-diff --git a/compiler/rustc_mir_transform/src/jump_threading.rs b/compiler/rustc_mir_transform/src/jump_threading.rs
-index a458297210db..e2d2864ad2a0 100644
---- a/compiler/rustc_mir_transform/src/jump_threading.rs
-+++ b/compiler/rustc_mir_transform/src/jump_threading.rs
-@@ -493,6 +493,13 @@ fn process_assign(
-                     BinOp::Ne => ScalarInt::FALSE,
-                     _ => return None,
-                 };
-+                if value.const_.ty().is_floating_point() {
-+                    // Floating point equality does not follow bit-patterns.
-+                    // -0.0 and NaN both have special rules for equality,
-+                    // and therefore we cannot use integer comparisons for them.
-+                    // Avoid handling them, though this could be extended in the future.
-+                    return None;
-+                }
-                 let value = value.const_.normalize(self.tcx, self.param_env).try_to_scalar_int()?;
-                 let conds = conditions.map(self.arena, |c| Condition {
-                     value,
-diff --git a/tests/mir-opt/jump_threading.floats.JumpThreading.panic-abort.diff b/tests/mir-opt/jump_threading.floats.JumpThreading.panic-abort.diff
-new file mode 100644
-index 000000000000..6ca37e96d297
---- /dev/null
-+++ b/tests/mir-opt/jump_threading.floats.JumpThreading.panic-abort.diff
-@@ -0,0 +1,59 @@
-+- // MIR for `floats` before JumpThreading
-++ // MIR for `floats` after JumpThreading
-+  
-+  fn floats() -> u32 {
-+      let mut _0: u32;
-+      let _1: f64;
-+      let mut _2: bool;
-+      let mut _3: bool;
-+      let mut _4: f64;
-+      scope 1 {
-+          debug x => _1;
-+      }
-+  
-+      bb0: {
-+          StorageLive(_1);
-+          StorageLive(_2);
-+          _2 = const true;
-+-         switchInt(move _2) -> [0: bb2, otherwise: bb1];
-++         goto -> bb1;
-+      }
-+  
-+      bb1: {
-+          _1 = const -0f64;
-+          goto -> bb3;
-+      }
-+  
-+      bb2: {
-+          _1 = const 1f64;
-+          goto -> bb3;
-+      }
-+  
-+      bb3: {
-+          StorageDead(_2);
-+          StorageLive(_3);
-+          StorageLive(_4);
-+          _4 = _1;
-+          _3 = Eq(move _4, const 0f64);
-+          switchInt(move _3) -> [0: bb5, otherwise: bb4];
-+      }
-+  
-+      bb4: {
-+          StorageDead(_4);
-+          _0 = const 0_u32;
-+          goto -> bb6;
-+      }
-+  
-+      bb5: {
-+          StorageDead(_4);
-+          _0 = const 1_u32;
-+          goto -> bb6;
-+      }
-+  
-+      bb6: {
-+          StorageDead(_3);
-+          StorageDead(_1);
-+          return;
-+      }
-+  }
-+  
-diff --git a/tests/mir-opt/jump_threading.floats.JumpThreading.panic-unwind.diff b/tests/mir-opt/jump_threading.floats.JumpThreading.panic-unwind.diff
-new file mode 100644
-index 000000000000..6ca37e96d297
---- /dev/null
-+++ b/tests/mir-opt/jump_threading.floats.JumpThreading.panic-unwind.diff
-@@ -0,0 +1,59 @@
-+- // MIR for `floats` before JumpThreading
-++ // MIR for `floats` after JumpThreading
-+  
-+  fn floats() -> u32 {
-+      let mut _0: u32;
-+      let _1: f64;
-+      let mut _2: bool;
-+      let mut _3: bool;
-+      let mut _4: f64;
-+      scope 1 {
-+          debug x => _1;
-+      }
-+  
-+      bb0: {
-+          StorageLive(_1);
-+          StorageLive(_2);
-+          _2 = const true;
-+-         switchInt(move _2) -> [0: bb2, otherwise: bb1];
-++         goto -> bb1;
-+      }
-+  
-+      bb1: {
-+          _1 = const -0f64;
-+          goto -> bb3;
-+      }
-+  
-+      bb2: {
-+          _1 = const 1f64;
-+          goto -> bb3;
-+      }
-+  
-+      bb3: {
-+          StorageDead(_2);
-+          StorageLive(_3);
-+          StorageLive(_4);
-+          _4 = _1;
-+          _3 = Eq(move _4, const 0f64);
-+          switchInt(move _3) -> [0: bb5, otherwise: bb4];
-+      }
-+  
-+      bb4: {
-+          StorageDead(_4);
-+          _0 = const 0_u32;
-+          goto -> bb6;
-+      }
-+  
-+      bb5: {
-+          StorageDead(_4);
-+          _0 = const 1_u32;
-+          goto -> bb6;
-+      }
-+  
-+      bb6: {
-+          StorageDead(_3);
-+          StorageDead(_1);
-+          return;
-+      }
-+  }
-+  
-diff --git a/tests/mir-opt/jump_threading.rs b/tests/mir-opt/jump_threading.rs
-index 57f4e4a2654f..3e7e8995f1a3 100644
---- a/tests/mir-opt/jump_threading.rs
-+++ b/tests/mir-opt/jump_threading.rs
-@@ -514,6 +514,16 @@ fn assume(a: u8, b: bool) -> u8 {
-     )
- }
- 
-+fn floats() -> u32 {
-+    // CHECK-LABEL: fn floats(
-+    // CHECK: switchInt(
-+
-+    // Test for issue #128243, where float equality was assumed to be bitwise.
-+    // When adding float support, it must be ensured that this continues working properly.
-+    let x = if true { -0.0 } else { 1.0 };
-+    if x == 0.0 { 0 } else { 1 }
-+}
-+
- fn main() {
-     // CHECK-LABEL: fn main(
-     too_complex(Ok(0));
-@@ -528,6 +538,7 @@ fn main() {
-     disappearing_bb(7);
-     aggregate(7);
-     assume(7, false);
-+    floats();
- }
- 
- // EMIT_MIR jump_threading.too_complex.JumpThreading.diff
-@@ -542,3 +553,4 @@ fn main() {
- // EMIT_MIR jump_threading.disappearing_bb.JumpThreading.diff
- // EMIT_MIR jump_threading.aggregate.JumpThreading.diff
- // EMIT_MIR jump_threading.assume.JumpThreading.diff
-+// EMIT_MIR jump_threading.floats.JumpThreading.diff
--- 
-2.46.0
-

SOURCES/0001-Make-issue-122805.rs-big-endian-compatible.patch

@@ -1,49 +0,0 @@
-From 26fa5c2c300f3c3a3ee3109c009bd4a6803a2a4c Mon Sep 17 00:00:00 2001
-From: Nikita Popov <npopov@redhat.com>
-Date: Tue, 11 Jun 2024 10:13:07 +0200
-Subject: [PATCH] Make issue-122805.rs big endian compatible
-
-Instead of not generating the function at all on big endian (which
-makes the CHECK lines fail), instead use to_le() on big endian,
-so that we essentially perform a bswap for both endiannesses.
----
- tests/codegen/issues/issue-122805.rs | 21 ++++++++++++---------
- 1 file changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/tests/codegen/issues/issue-122805.rs b/tests/codegen/issues/issue-122805.rs
-index 6d108ada6dd..8e03c6c8884 100644
---- a/tests/codegen/issues/issue-122805.rs
-+++ b/tests/codegen/issues/issue-122805.rs
-@@ -39,17 +39,20 @@
- // OPT3WINX64-NEXT: store <8 x i16>
- // CHECK-NEXT: ret void
- #[no_mangle]
--#[cfg(target_endian = "little")]
- pub fn convert(value: [u16; 8]) -> [u8; 16] {
-+    #[cfg(target_endian = "little")]
-+    let bswap = u16::to_be;
-+    #[cfg(target_endian = "big")]
-+    let bswap = u16::to_le;
-     let addr16 = [
--        value[0].to_be(),
--        value[1].to_be(),
--        value[2].to_be(),
--        value[3].to_be(),
--        value[4].to_be(),
--        value[5].to_be(),
--        value[6].to_be(),
--        value[7].to_be(),
-+        bswap(value[0]),
-+        bswap(value[1]),
-+        bswap(value[2]),
-+        bswap(value[3]),
-+        bswap(value[4]),
-+        bswap(value[5]),
-+        bswap(value[6]),
-+        bswap(value[7]),
-     ];
-     unsafe { core::mem::transmute::<_, [u8; 16]>(addr16) }
- }
--- 
-2.45.1
-

SOURCES/0001-Use-an-explicit-x86-64-cpu-in-tests-that-are-sensiti.patch

@@ -1,264 +0,0 @@
-From 706f06c39a9e08a4708a53722429d13ae4069c2f Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Wed, 1 May 2024 15:25:26 -0700
-Subject: [PATCH] Use an explicit x86-64 cpu in tests that are sensitive to it
-
-There are a few tests that depend on some target features **not** being
-enabled by default, and usually they are correct with the default x86-64
-target CPU. However, in downstream builds we have modified the default
-to fit our distros -- `x86-64-v2` in RHEL 9 and `x86-64-v3` in RHEL 10
--- and the latter especially trips tests that expect not to have AVX.
-
-These cases are few enough that we can just set them back explicitly.
----
- tests/assembly/simd-intrinsic-mask-reduce.rs  |  1 +
- tests/assembly/x86_64-floating-point-clamp.rs |  2 +-
- .../codegen/target-feature-inline-closure.rs  |  2 +-
- tests/ui/asm/x86_64/target-feature-attr.rs    |  1 +
- .../ui/asm/x86_64/target-feature-attr.stderr  |  8 +++---
- .../const-eval/const_fn_target_feature.rs     |  2 +-
- .../rfc-2396-target_feature-11/safe-calls.rs  |  1 +
- .../safe-calls.stderr                         | 28 +++++++++----------
- tests/ui/sse2.rs                              |  4 +--
- 9 files changed, 26 insertions(+), 23 deletions(-)
-
-diff --git a/tests/assembly/simd-intrinsic-mask-reduce.rs b/tests/assembly/simd-intrinsic-mask-reduce.rs
-index 763401755fad..0d77fc410511 100644
---- a/tests/assembly/simd-intrinsic-mask-reduce.rs
-+++ b/tests/assembly/simd-intrinsic-mask-reduce.rs
-@@ -1,6 +1,7 @@
- // verify that simd mask reductions do not introduce additional bit shift operations
- //@ revisions: x86 aarch64
- //@ [x86] compile-flags: --target=x86_64-unknown-linux-gnu -C llvm-args=-x86-asm-syntax=intel
-+//@ [x86] compile-flags: -C target-cpu=x86-64
- //@ [x86] needs-llvm-components: x86
- //@ [aarch64] compile-flags: --target=aarch64-unknown-linux-gnu
- //@ [aarch64] needs-llvm-components: aarch64
-diff --git a/tests/assembly/x86_64-floating-point-clamp.rs b/tests/assembly/x86_64-floating-point-clamp.rs
-index 4a72a7f44fa0..b963aee35590 100644
---- a/tests/assembly/x86_64-floating-point-clamp.rs
-+++ b/tests/assembly/x86_64-floating-point-clamp.rs
-@@ -2,7 +2,7 @@
- // so check to make sure that's what it's actually emitting.
- 
- //@ assembly-output: emit-asm
--//@ compile-flags: --crate-type=lib -O -C llvm-args=-x86-asm-syntax=intel
-+//@ compile-flags: --crate-type=lib -O -C llvm-args=-x86-asm-syntax=intel -C target-cpu=x86-64
- //@ only-x86_64
- //@ ignore-sgx
- 
-diff --git a/tests/codegen/target-feature-inline-closure.rs b/tests/codegen/target-feature-inline-closure.rs
-index 88bd413a8707..20bb4e66ff21 100644
---- a/tests/codegen/target-feature-inline-closure.rs
-+++ b/tests/codegen/target-feature-inline-closure.rs
-@@ -1,5 +1,5 @@
- //@ only-x86_64
--//@ compile-flags: -Copt-level=3
-+//@ compile-flags: -Copt-level=3 -Ctarget-cpu=x86-64
- 
- #![crate_type = "lib"]
- #![feature(target_feature_11)]
-diff --git a/tests/ui/asm/x86_64/target-feature-attr.rs b/tests/ui/asm/x86_64/target-feature-attr.rs
-index 820be132ef79..51829be15065 100644
---- a/tests/ui/asm/x86_64/target-feature-attr.rs
-+++ b/tests/ui/asm/x86_64/target-feature-attr.rs
-@@ -1,4 +1,5 @@
- //@ only-x86_64
-+//@ compile-flags: -C target-cpu=x86-64
- 
- #![feature(avx512_target_feature)]
- 
-diff --git a/tests/ui/asm/x86_64/target-feature-attr.stderr b/tests/ui/asm/x86_64/target-feature-attr.stderr
-index c852726ee7ff..1a9962732cfb 100644
---- a/tests/ui/asm/x86_64/target-feature-attr.stderr
-+++ b/tests/ui/asm/x86_64/target-feature-attr.stderr
-@@ -1,23 +1,23 @@
- error: register class `ymm_reg` requires the `avx` target feature
--  --> $DIR/target-feature-attr.rs:18:40
-+  --> $DIR/target-feature-attr.rs:19:40
-    |
- LL |     asm!("vaddps {2:y}, {0:y}, {1:y}", in(ymm_reg) x, in(ymm_reg) y, lateout(ymm_reg) x);
-    |                                        ^^^^^^^^^^^^^
- 
- error: register class `ymm_reg` requires the `avx` target feature
--  --> $DIR/target-feature-attr.rs:18:55
-+  --> $DIR/target-feature-attr.rs:19:55
-    |
- LL |     asm!("vaddps {2:y}, {0:y}, {1:y}", in(ymm_reg) x, in(ymm_reg) y, lateout(ymm_reg) x);
-    |                                                       ^^^^^^^^^^^^^
- 
- error: register class `ymm_reg` requires the `avx` target feature
--  --> $DIR/target-feature-attr.rs:18:70
-+  --> $DIR/target-feature-attr.rs:19:70
-    |
- LL |     asm!("vaddps {2:y}, {0:y}, {1:y}", in(ymm_reg) x, in(ymm_reg) y, lateout(ymm_reg) x);
-    |                                                                      ^^^^^^^^^^^^^^^^^^
- 
- error: register class `kreg` requires at least one of the following target features: avx512bw, avx512f
--  --> $DIR/target-feature-attr.rs:33:23
-+  --> $DIR/target-feature-attr.rs:34:23
-    |
- LL |     asm!("/* {0} */", in(kreg) x);
-    |                       ^^^^^^^^^^
-diff --git a/tests/ui/consts/const-eval/const_fn_target_feature.rs b/tests/ui/consts/const-eval/const_fn_target_feature.rs
-index b56b68a57958..d0de9d8d7a34 100644
---- a/tests/ui/consts/const-eval/const_fn_target_feature.rs
-+++ b/tests/ui/consts/const-eval/const_fn_target_feature.rs
-@@ -1,5 +1,5 @@
- //@ only-x86_64
--//@ compile-flags:-C target-feature=+ssse3
-+//@ compile-flags: -C target-cpu=x86-64 -C target-feature=+ssse3
- 
- #![crate_type = "lib"]
- 
-diff --git a/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.rs b/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.rs
-index c73b8d7e4d29..6fb0688008e6 100644
---- a/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.rs
-+++ b/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.rs
-@@ -1,4 +1,5 @@
- //@ only-x86_64
-+//@ compile-flags: -C target-cpu=x86-64
- 
- #![feature(target_feature_11)]
- 
-diff --git a/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.stderr b/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.stderr
-index d9d7e297f8e9..fed3da6594cb 100644
---- a/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.stderr
-+++ b/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.stderr
-@@ -1,5 +1,5 @@
- error[E0133]: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe function or block
--  --> $DIR/safe-calls.rs:25:5
-+  --> $DIR/safe-calls.rs:26:5
-    |
- LL |     sse2();
-    |     ^^^^^^ call to function with `#[target_feature]`
-@@ -8,7 +8,7 @@ LL |     sse2();
-    = note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]`
- 
- error[E0133]: call to function `avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
--  --> $DIR/safe-calls.rs:27:5
-+  --> $DIR/safe-calls.rs:28:5
-    |
- LL |     avx_bmi2();
-    |     ^^^^^^^^^^ call to function with `#[target_feature]`
-@@ -16,7 +16,7 @@ LL |     avx_bmi2();
-    = help: in order for the call to be safe, the context requires the following additional target features: avx and bmi2
- 
- error[E0133]: call to function `Quux::avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
--  --> $DIR/safe-calls.rs:29:5
-+  --> $DIR/safe-calls.rs:30:5
-    |
- LL |     Quux.avx_bmi2();
-    |     ^^^^^^^^^^^^^^^ call to function with `#[target_feature]`
-@@ -24,7 +24,7 @@ LL |     Quux.avx_bmi2();
-    = help: in order for the call to be safe, the context requires the following additional target features: avx and bmi2
- 
- error[E0133]: call to function `avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
--  --> $DIR/safe-calls.rs:35:5
-+  --> $DIR/safe-calls.rs:36:5
-    |
- LL |     avx_bmi2();
-    |     ^^^^^^^^^^ call to function with `#[target_feature]`
-@@ -32,7 +32,7 @@ LL |     avx_bmi2();
-    = help: in order for the call to be safe, the context requires the following additional target features: avx and bmi2
- 
- error[E0133]: call to function `Quux::avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
--  --> $DIR/safe-calls.rs:37:5
-+  --> $DIR/safe-calls.rs:38:5
-    |
- LL |     Quux.avx_bmi2();
-    |     ^^^^^^^^^^^^^^^ call to function with `#[target_feature]`
-@@ -40,7 +40,7 @@ LL |     Quux.avx_bmi2();
-    = help: in order for the call to be safe, the context requires the following additional target features: avx and bmi2
- 
- error[E0133]: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe function or block
--  --> $DIR/safe-calls.rs:43:5
-+  --> $DIR/safe-calls.rs:44:5
-    |
- LL |     sse2();
-    |     ^^^^^^ call to function with `#[target_feature]`
-@@ -49,7 +49,7 @@ LL |     sse2();
-    = note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]`
- 
- error[E0133]: call to function `avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
--  --> $DIR/safe-calls.rs:45:5
-+  --> $DIR/safe-calls.rs:46:5
-    |
- LL |     avx_bmi2();
-    |     ^^^^^^^^^^ call to function with `#[target_feature]`
-@@ -57,7 +57,7 @@ LL |     avx_bmi2();
-    = help: in order for the call to be safe, the context requires the following additional target feature: bmi2
- 
- error[E0133]: call to function `Quux::avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block
--  --> $DIR/safe-calls.rs:47:5
-+  --> $DIR/safe-calls.rs:48:5
-    |
- LL |     Quux.avx_bmi2();
-    |     ^^^^^^^^^^^^^^^ call to function with `#[target_feature]`
-@@ -65,7 +65,7 @@ LL |     Quux.avx_bmi2();
-    = help: in order for the call to be safe, the context requires the following additional target feature: bmi2
- 
- error[E0133]: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe function or block
--  --> $DIR/safe-calls.rs:54:5
-+  --> $DIR/safe-calls.rs:55:5
-    |
- LL |     sse2();
-    |     ^^^^^^ call to function with `#[target_feature]`
-@@ -74,7 +74,7 @@ LL |     sse2();
-    = note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]`
- 
- error[E0133]: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe function or block
--  --> $DIR/safe-calls.rs:58:15
-+  --> $DIR/safe-calls.rs:59:15
-    |
- LL | const _: () = sse2();
-    |               ^^^^^^ call to function with `#[target_feature]`
-@@ -83,7 +83,7 @@ LL | const _: () = sse2();
-    = note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]`
- 
- error[E0133]: call to function `sse2_and_fxsr` with `#[target_feature]` is unsafe and requires unsafe function or block
--  --> $DIR/safe-calls.rs:61:15
-+  --> $DIR/safe-calls.rs:62:15
-    |
- LL | const _: () = sse2_and_fxsr();
-    |               ^^^^^^^^^^^^^^^ call to function with `#[target_feature]`
-@@ -92,7 +92,7 @@ LL | const _: () = sse2_and_fxsr();
-    = note: the fxsr and sse2 target features being enabled in the build configuration does not remove the requirement to list them in `#[target_feature]`
- 
- error: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe block (error E0133)
--  --> $DIR/safe-calls.rs:68:5
-+  --> $DIR/safe-calls.rs:69:5
-    |
- LL |     sse2();
-    |     ^^^^^^ call to function with `#[target_feature]`
-@@ -101,12 +101,12 @@ LL |     sse2();
-    = help: in order for the call to be safe, the context requires the following additional target feature: sse2
-    = note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]`
- note: an unsafe function restricts its caller, but its body is safe by default
--  --> $DIR/safe-calls.rs:67:1
-+  --> $DIR/safe-calls.rs:68:1
-    |
- LL | unsafe fn needs_unsafe_block() {
-    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- note: the lint level is defined here
--  --> $DIR/safe-calls.rs:64:8
-+  --> $DIR/safe-calls.rs:65:8
-    |
- LL | #[deny(unsafe_op_in_unsafe_fn)]
-    |        ^^^^^^^^^^^^^^^^^^^^^^
-diff --git a/tests/ui/sse2.rs b/tests/ui/sse2.rs
-index fa6d79713b4b..c203ca2716ff 100644
---- a/tests/ui/sse2.rs
-+++ b/tests/ui/sse2.rs
-@@ -20,6 +20,6 @@ fn main() {
-                 "SSE2 was not detected as available on an x86 platform");
-     }
-     // check a negative case too -- allowed on x86, but not enabled by default
--    assert!(cfg!(not(target_feature = "avx2")),
--            "AVX2 shouldn't be detected as available by default on any platform");
-+    assert!(cfg!(not(target_feature = "avx512f")),
-+            "AVX512 shouldn't be detected as available by default on any platform");
- }
--- 
-2.44.0
-

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

@@ -48,18 +48,6 @@ index 5abfb8162f70..13cb43bda1a4 100644
  
      // We disable MMX and SSE for now, even though UEFI allows using them. Problem is, you have to
      // enable these CPU features explicitly before their first use, otherwise their instructions
-diff -Naur a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
---- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs	2024-03-17 12:03:00.000000000 -0700
-+++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs	2024-03-22 10:02:17.742806274 -0700
-@@ -14,7 +14,7 @@
-     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,
 -- 
 2.41.0
 

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

@@ -1,4 +1,4 @@
-From 2b99134e2884fa56bcab6d360885ec5421048e66 Mon Sep 17 00:00:00 2001
+From df0d6f1d8b46db82d7599ca8eff6e8f844cf52f2 Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
 Date: Thu, 28 Sep 2023 18:14:28 -0700
 Subject: [PATCH 1/2] bootstrap: allow disabling target self-contained
@@ -11,12 +11,12 @@ Subject: [PATCH 1/2] bootstrap: allow disabling target self-contained
  4 files changed, 22 insertions(+)
 
 diff --git a/config.example.toml b/config.example.toml
-index f94553dd63f7..5ec969c80a37 100644
+index e5df28a49af6..2fcd8b8cb057 100644
 --- a/config.example.toml
 +++ b/config.example.toml
-@@ -869,6 +869,11 @@
- # argument as the test binary.
- #runner = <none> (string)
+@@ -807,6 +807,11 @@ change-id = 116881
+ # target triples containing `-none`, `nvptx`, `switch`, or `-uefi`.
+ #no-std = <platform-specific> (bool)
  
 +# Copy libc and CRT objects into the target lib/self-contained/ directory.
 +# Enabled by default on `musl`, `wasi`, and `windows-gnu` targets. Other
@@ -27,10 +27,10 @@ index f94553dd63f7..5ec969c80a37 100644
  # Distribution options
  #
 diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
-index e927b491c71e..69a80d01d6b9 100644
+index 7021a9543582..11555c65ca87 100644
 --- a/src/bootstrap/src/core/build_steps/compile.rs
 +++ b/src/bootstrap/src/core/build_steps/compile.rs
-@@ -356,6 +356,10 @@ fn copy_self_contained_objects(
+@@ -302,6 +302,10 @@ fn copy_self_contained_objects(
      compiler: &Compiler,
      target: TargetSelection,
  ) -> Vec<(PathBuf, DependencyType)> {
@@ -42,18 +42,18 @@ index e927b491c71e..69a80d01d6b9 100644
      t!(fs::create_dir_all(&libdir_self_contained));
      let mut target_deps = vec![];
 diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
-index 3e1bc9a9acdd..5e24a9cc4f60 100644
+index 0a9175aa3ea5..a2e028b25036 100644
 --- a/src/bootstrap/src/core/config/config.rs
 +++ b/src/bootstrap/src/core/config/config.rs
-@@ -586,6 +586,7 @@ pub struct Target {
-     pub runner: Option<String>,
+@@ -533,6 +533,7 @@ pub struct Target {
+     pub wasi_root: Option<PathBuf>,
+     pub qemu_rootfs: Option<PathBuf>,
      pub no_std: bool,
-     pub codegen_backends: Option<Vec<String>>,
 +    pub self_contained: bool,
  }
  
  impl Target {
-@@ -594,6 +595,9 @@ pub fn from_triple(triple: &str) -> Self {
+@@ -541,6 +542,9 @@ pub fn from_triple(triple: &str) -> Self {
          if triple.contains("-none") || triple.contains("nvptx") || triple.contains("switch") {
              target.no_std = true;
          }
@@ -63,15 +63,15 @@ index 3e1bc9a9acdd..5e24a9cc4f60 100644
          target
      }
  }
-@@ -1150,6 +1154,7 @@ struct TomlTarget {
+@@ -1051,6 +1055,7 @@ struct TomlTarget {
+         wasi_root: Option<String> = "wasi-root",
+         qemu_rootfs: Option<String> = "qemu-rootfs",
          no_std: Option<bool> = "no-std",
-         codegen_backends: Option<Vec<String>> = "codegen-backends",
-         runner: Option<String> = "runner",
 +        self_contained: Option<bool> = "self-contained",
      }
  }
  
-@@ -1870,6 +1875,9 @@ fn get_table(option: &str) -> Result<TomlConfig, toml::de::Error> {
+@@ -1600,6 +1605,9 @@ fn get_table(option: &str) -> Result<TomlConfig, toml::de::Error> {
                  if let Some(s) = cfg.no_std {
                      target.no_std = s;
                  }
@@ -82,10 +82,10 @@ index 3e1bc9a9acdd..5e24a9cc4f60 100644
                  target.cxx = cfg.cxx.map(PathBuf::from);
                  target.ar = cfg.ar.map(PathBuf::from);
 diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
-index 5ed6b357e20a..c23b21d65713 100644
+index 33b8f1a7ce72..f36e53187576 100644
 --- a/src/bootstrap/src/lib.rs
 +++ b/src/bootstrap/src/lib.rs
-@@ -1348,6 +1348,11 @@ fn no_std(&self, target: TargetSelection) -> Option<bool> {
+@@ -1335,6 +1335,11 @@ fn no_std(&self, target: TargetSelection) -> Option<bool> {
          self.config.target_config.get(&target).map(|t| t.no_std)
      }
  
@@ -98,5 +98,5 @@ index 5ed6b357e20a..c23b21d65713 100644
      /// and `remote-test-server` binaries.
      fn remote_tested(&self, target: TargetSelection) -> bool {
 -- 
-2.44.0
+2.41.0
 

SOURCES/0001-bootstrap-only-show-PGO-warnings-when-verbose.patch

@@ -0,0 +1,33 @@
+From 776146e9ebb6bbe17a37bfad955f3dac95317275 Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Thu, 16 Nov 2023 10:42:23 -0800
+Subject: [PATCH] bootstrap: only show PGO warnings when verbose
+
+Building rustc with `--rust-profile-use` is currently dumping a lot of
+warnings of "no profile data available for function" from `rustc_smir`
+and `stable_mir`. These simply aren't exercised by the current profile-
+gathering steps, but that's to be expected for new or experimental
+functionality. I think for most people, these warnings will be just
+noise, so it makes sense to only have them in verbose builds.
+---
+ src/bootstrap/src/core/build_steps/compile.rs | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
+index af69860df1c5..51e4195827fc 100644
+--- a/src/bootstrap/src/core/build_steps/compile.rs
++++ b/src/bootstrap/src/core/build_steps/compile.rs
+@@ -887,7 +887,9 @@ fn run(self, builder: &Builder<'_>) {
+         } else if let Some(path) = &builder.config.rust_profile_use {
+             if compiler.stage == 1 {
+                 cargo.rustflag(&format!("-Cprofile-use={path}"));
+-                cargo.rustflag("-Cllvm-args=-pgo-warn-missing-function");
++                if builder.is_verbose() {
++                    cargo.rustflag("-Cllvm-args=-pgo-warn-missing-function");
++                }
+                 true
+             } else {
+                 false
+-- 
+2.43.0
+

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

@@ -1,19 +1,19 @@
-From e3b7d2e3d3b4fcbc6591de606957c0fd59b5e547 Mon Sep 17 00:00:00 2001
+From 79bb610c8fc5d9df7dd4720ae847b8f17e7b1ad4 Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
 Date: Thu, 28 Sep 2023 18:18:16 -0700
 Subject: [PATCH 2/2] set an external library path for wasm32-wasi
 
 ---
  compiler/rustc_codegen_ssa/src/back/link.rs           | 9 +++++++++
- compiler/rustc_target/src/spec/mod.rs                   | 4 ++++
- compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs | 7 ++++---
- 3 files changed, 17 insertions(+), 3 deletions(-)
+ compiler/rustc_target/src/spec/mod.rs                 | 2 ++
+ compiler/rustc_target/src/spec/targets/wasm32_wasi.rs | 6 +++++-
+ 3 files changed, 16 insertions(+), 1 deletion(-)
 
 diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
-index f5e8d5fc92a9..f4ad3f725427 100644
+index dd9d277fb775..3d0f0502f255 100644
 --- a/compiler/rustc_codegen_ssa/src/back/link.rs
 +++ b/compiler/rustc_codegen_ssa/src/back/link.rs
-@@ -1563,6 +1563,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat
+@@ -1496,6 +1496,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat
              return file_path;
          }
      }
@@ -26,7 +26,7 @@ index f5e8d5fc92a9..f4ad3f725427 100644
      for search_path in fs.search_paths() {
          let file_path = search_path.dir.join(name);
          if file_path.exists() {
-@@ -2049,6 +2055,9 @@ fn add_library_search_dirs(cmd: &mut dyn Linker, sess: &Session, self_contained:
+@@ -1982,6 +1988,9 @@ fn add_library_search_dirs(cmd: &mut dyn Linker, sess: &Session, self_contained:
          let lib_path = sess.target_filesearch(PathKind::All).get_self_contained_lib_path();
          cmd.include_path(&fix_windows_verbatim_for_gcc(&lib_path));
      }
@@ -37,10 +37,10 @@ index f5e8d5fc92a9..f4ad3f725427 100644
  
  /// Add options making relocation sections in the produced ELF files read-only
 diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
-index 941d767b850d..cd0a2ce51989 100644
+index f04799482c83..25410b37ba24 100644
 --- a/compiler/rustc_target/src/spec/mod.rs
 +++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -1881,6 +1881,7 @@ pub struct TargetOptions {
+@@ -1874,6 +1874,7 @@ pub struct TargetOptions {
      /// Objects to link before and after all other object code.
      pub pre_link_objects: CrtObjects,
      pub post_link_objects: CrtObjects,
@@ -48,7 +48,7 @@ index 941d767b850d..cd0a2ce51989 100644
      /// Same as `(pre|post)_link_objects`, but when self-contained linking mode is enabled.
      pub pre_link_objects_self_contained: CrtObjects,
      pub post_link_objects_self_contained: CrtObjects,
-@@ -2368,6 +2369,7 @@ fn default() -> TargetOptions {
+@@ -2352,6 +2353,7 @@ fn default() -> TargetOptions {
              relro_level: RelroLevel::None,
              pre_link_objects: Default::default(),
              post_link_objects: Default::default(),
@@ -56,42 +56,23 @@ index 941d767b850d..cd0a2ce51989 100644
              pre_link_objects_self_contained: Default::default(),
              post_link_objects_self_contained: Default::default(),
              link_self_contained: LinkSelfContainedDefault::False,
-@@ -3064,6 +3066,7 @@ macro_rules! key {
-         key!(linker_is_gnu_json = "linker-is-gnu", bool);
-         key!(pre_link_objects = "pre-link-objects", link_objects);
-         key!(post_link_objects = "post-link-objects", link_objects);
-+        key!(external_lib_path, optional);
-         key!(pre_link_objects_self_contained = "pre-link-objects-fallback", link_objects);
-         key!(post_link_objects_self_contained = "post-link-objects-fallback", link_objects);
-         // Deserializes the backwards-compatible variants of `-Clink-self-contained`
-@@ -3327,6 +3330,7 @@ macro_rules! target_option_val {
-         target_option_val!(linker_is_gnu_json, "linker-is-gnu");
-         target_option_val!(pre_link_objects);
-         target_option_val!(post_link_objects);
-+        target_option_val!(external_lib_path);
-         target_option_val!(pre_link_objects_self_contained, "pre-link-objects-fallback");
-         target_option_val!(post_link_objects_self_contained, "post-link-objects-fallback");
-         target_option_val!(link_args - pre_link_args_json, "pre-link-args");
-diff --git a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
-index 7cbe9f09e6ca..b524890c2ec5 100644
---- a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
-+++ b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
-@@ -20,11 +20,12 @@ pub fn target() -> Target {
-     options.os = "wasi".into();
-     options.add_pre_link_args(LinkerFlavor::WasmLld(Cc::Yes), &["--target=wasm32-wasi"]);
- 
--    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();
+diff --git a/compiler/rustc_target/src/spec/targets/wasm32_wasi.rs b/compiler/rustc_target/src/spec/targets/wasm32_wasi.rs
+index 6dbcb01ea436..2151f86d0648 100644
+--- a/compiler/rustc_target/src/spec/targets/wasm32_wasi.rs
++++ b/compiler/rustc_target/src/spec/targets/wasm32_wasi.rs
+@@ -86,7 +86,11 @@ pub fn target() -> Target {
+     options.post_link_objects_self_contained = 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.pre_link_objects = options.pre_link_objects_self_contained.clone();
++    options.post_link_objects = options.post_link_objects_self_contained.clone();
 +    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.44.0
+2.41.0
 

SOURCES/cargo_vendor.attr

@@ -1,2 +0,0 @@
-%__cargo_vendor_path     ^%{_defaultlicensedir}(/[^/]+)+/cargo-vendor.txt$
-%__cargo_vendor_provides %{_rpmconfigdir}/cargo_vendor.prov

SOURCES/cargo_vendor.prov

@@ -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"""
-    ^
-    (?P<major>0|[1-9]\d*)
-    \.(?P<minor>0|[1-9]\d*)
-    \.(?P<patch>0|[1-9]\d*)
-    (?:-(?P<pre>(?: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<build>[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()

SOURCES/macros.rust-toolset

@@ -1,7 +1,12 @@
-# __rustc: path to the default rustc executable
+# Explicitly use bindir tools, in case others are in the PATH,
+# like the rustup shims in a user's ~/.cargo/bin/.
+#
+# Since cargo 1.31, install only uses $CARGO_HOME/config, ignoring $PWD.
+#   https://github.com/rust-lang/cargo/issues/6397
+# But we can set CARGO_HOME locally, which is a good idea anyway to make sure
+# it never writes to ~/.cargo during rpmbuild.
+%__cargo /usr/bin/env CARGO_HOME=.cargo RUSTFLAGS='%{build_rustflags}' /usr/bin/cargo
 %__rustc /usr/bin/rustc
-
-# __rustdoc: path to the default rustdoc executable
 %__rustdoc /usr/bin/rustdoc
 
 # rustflags_opt_level: default optimization level
@@ -35,54 +40,20 @@
   -Copt-level=%rustflags_opt_level
   -Cdebuginfo=%rustflags_debuginfo
   -Ccodegen-units=%rustflags_codegen_units
-  -Cstrip=none
 }
 
-# __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 <number>    - unpack and use vendored sources from Source<number> tarball
-#                    (deprecated; use -v instead)
-#   -v <directory> - use vendored sources from <directory>
-#   -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\
+%cargo_prep(V:) (\
+%{__mkdir} -p .cargo \
+cat > .cargo/config << 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}"\
@@ -94,28 +65,27 @@ 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}"\
+%if 0%{-V:1}\
+%{__tar} -xoaf %{S:%{-V*}}\
+cat >> .cargo/config << EOF \
 \
 [source.crates-io]\
-registry = "https://crates.io"\
 replace-with = "vendored-sources"\
-EOF}\
-%{__rm} -f Cargo.toml.orig\
+\
+[source.vendored-sources]\
+directory = "./vendor"\
+EOF\
+%endif\
 )
 
 # __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}}}   \
+%{-f:%{-a:%{error:Can't specify both -f(%{-f*}) and -a}}} \
   %{-n:--no-default-features}                             \
   %{-a:--all-features}                                    \
   %{-f:--features %{-f*}}                                 \
-    %{nil}                                                      \
+  %{nil}
 }
 
 # NB: cargo_build/test/install do not use the -n/-a/-f argument parsing like
@@ -124,11 +94,11 @@ EOF}\
 # explicitly use --no-default-features, --all-features, or --features XYZ.
 
 # cargo_build: builds the crate with cargo
-%cargo_build\
-%{shrink:                                               \
+%cargo_build \
+%{shrink:\
   %{__cargo} build                                   \
     %{__cargo_common_opts}                           \
-    --profile rpm                                       \
+    --release                                        \
 }
 
 # cargo_test: runs the test suite with cargo
@@ -138,11 +108,11 @@ EOF}\
 # "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\
-%{shrink:                                               \
+%cargo_test \
+%{shrink:\
   %{__cargo} test                                    \
     %{__cargo_common_opts}                           \
-    --profile rpm                                       \
+    --release                                        \
     --no-fail-fast                                   \
 }
 
@@ -153,17 +123,13 @@ EOF}\
 # "$CARGO_HOME/.crates.toml" file, which is used to keep track of which version
 # of a specific binary has been installed, but which conflicts between builds
 # of different Rust applications and is not needed when building RPM packages.
-%cargo_install\
-(\
-set -euo pipefail                                                   \
-  %{shrink:                                                         \
+%cargo_install \
+%{shrink:                                                         \
   %{__cargo} install                                              \
     %{__cargo_common_opts}                                        \
-      --profile rpm                                                 \
     --no-track                                                    \
     --path .                                                      \
-  }                                                                 \
-)
+}                                                                 \
 
 # cargo_license: print license information for all crate dependencies
 #
@@ -179,21 +145,19 @@ set -euo pipefail                                                   \
 # The "cargo tree" command called by this macro will fail if there are missing
 # (optional) dependencies.
 %cargo_license(naf:)\
-(\
-set -euo pipefail\
-%{shrink:                                                           \
+%{shrink:\
     %{__cargo} tree                                                 \
     --workspace                                                     \
     --offline                                                       \
     --edges no-build,no-dev,no-proc-macro                           \
     --no-dedupe                                                     \
+    --target all                                                    \
     %{__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                                                       \
-}\
-)
+    | sort -u
+}
 
 # cargo_license_summary: print license summary for all crate dependencies
 #
@@ -202,46 +166,16 @@ set -euo pipefail\
 # 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:                                                           \
+%{shrink:\
     %{__cargo} tree                                                 \
     --workspace                                                     \
     --offline                                                       \
     --edges no-build,no-dev,no-proc-macro                           \
     --no-dedupe                                                     \
+    --target all                                                    \
     %{__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                                              \
-}\
-)
-
+}

SOURCES/rustc-1.75.0-disable-libssh2.patch

@@ -0,0 +1,42 @@
+--- ./rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2023-11-12 12:24:35.000000000 -0800
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2023-11-14 17:01:32.010125953 -0800
+@@ -2027,7 +2027,6 @@
+ dependencies = [
+  "cc",
+  "libc",
+- "libssh2-sys",
+  "libz-sys",
+  "openssl-sys",
+  "pkg-config",
+@@ -2060,20 +2059,6 @@
+ ]
+ 
+ [[package]]
+-name = "libssh2-sys"
+-version = "0.3.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
+-dependencies = [
+- "cc",
+- "libc",
+- "libz-sys",
+- "openssl-sys",
+- "pkg-config",
+- "vcpkg",
+-]
+-
+-[[package]]
+ name = "libz-sys"
+ version = "1.1.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+--- ./rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2023-11-14 17:01:32.010125953 -0800
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2023-11-14 17:02:44.645097701 -0800
+@@ -40,7 +40,7 @@
+ curl-sys = "0.4.68"
+ filetime = "0.2.22"
+ flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
+-git2 = "0.18.1"
++git2 = { version = "0.18.1", default-features = false, features = ["https"] }
+ git2-curl = "0.19.0"
+ gix = { version = "0.55.2", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
+ gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }

SOURCES/rustc-1.79.0-disable-libssh2.patch

@@ -1,44 +0,0 @@
-diff -up rustc-1.79.0-src/src/tools/cargo/Cargo.lock.orig rustc-1.79.0-src/src/tools/cargo/Cargo.lock
---- rustc-1.79.0-src/src/tools/cargo/Cargo.lock.orig	2024-06-13 16:37:16.640599290 -0700
-+++ rustc-1.79.0-src/src/tools/cargo/Cargo.lock	2024-06-13 16:37:16.646599231 -0700
-@@ -2150,7 +2150,6 @@ checksum = "ee4126d8b4ee5c9d9ea891dd875c
- dependencies = [
-  "cc",
-  "libc",
-- "libssh2-sys",
-  "libz-sys",
-  "openssl-sys",
-  "pkg-config",
-@@ -2191,20 +2190,6 @@ dependencies = [
-  "pkg-config",
-  "vcpkg",
- ]
--
--[[package]]
--name = "libssh2-sys"
--version = "0.3.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
--dependencies = [
-- "cc",
-- "libc",
-- "libz-sys",
-- "openssl-sys",
-- "pkg-config",
-- "vcpkg",
--]
- 
- [[package]]
- name = "libz-sys"
-diff -up rustc-1.79.0-src/src/tools/cargo/Cargo.toml.orig rustc-1.79.0-src/src/tools/cargo/Cargo.toml
---- rustc-1.79.0-src/src/tools/cargo/Cargo.toml.orig	2024-06-13 16:37:16.646599231 -0700
-+++ rustc-1.79.0-src/src/tools/cargo/Cargo.toml	2024-06-13 16:39:06.040526596 -0700
-@@ -44,7 +44,7 @@ curl = "0.4.46"
- curl-sys = "0.4.72"
- filetime = "0.2.23"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.3"
-+git2 = { version = "0.18.3", default-features = false, features = ["https"] }
- git2-curl = "0.19.0"
- gix = { version = "0.63.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision", "parallel", "dirwalk"] }
- glob = "0.3.1"

SOURCES/rustc-1.79.0-unbundle-sqlite.patch

@@ -1,23 +0,0 @@
-diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock
---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2006-07-24 10:21:28.000000000 +0900
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2024-05-06 14:13:00.172595245 +0900
-@@ -2191,7 +2191,6 @@ version = "0.28.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f"
- dependencies = [
-- "cc",
-  "pkg-config",
-  "vcpkg",
- ]
-diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2024-05-06 14:13:00.173595257 +0900
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2024-05-06 14:13:54.089275003 +0900
-@@ -77,7 +77,7 @@ proptest = "1.4.0"
- pulldown-cmark = { version = "0.10.2", default-features = false, features = ["html"] }
- rand = "0.8.5"
- regex = "1.10.4"
--rusqlite = { version = "0.31.0", features = ["bundled"] }
-+rusqlite = { version = "0.31.0", features = [] }
- rustfix = { version = "0.8.2", path = "crates/rustfix" }
- same-file = "1.0.6"
- security-framework = "2.10.0"

SPECS/rust.spec

@@ -1,6 +1,6 @@
 Name:           rust
-Version:        1.79.0
-Release:        2%{?dist}
+Version:        1.75.0
+Release:        1%{?dist}
 Summary:        The Rust Programming Language
 License:        (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-DFS-2016)
 # ^ written as: (rust itself) and (bundled libraries)
@@ -14,9 +14,9 @@ ExclusiveArch:  %{rust_arches}
 # To bootstrap from scratch, set the channel and date from src/stage0.json
 # e.g. 1.59.0 wants rustc: 1.58.0-2022-01-13
 # or nightly wants some beta-YYYY-MM-DD
-%global bootstrap_version 1.78.0
-%global bootstrap_channel 1.78.0
-%global bootstrap_date 2024-05-02
+%global bootstrap_version 1.74.0
+%global bootstrap_channel 1.74.0
+%global bootstrap_date 2023-11-16
 
 # Only the specified arches will use bootstrap binaries.
 # NOTE: Those binaries used to be uploaded with every new release, but that was
@@ -28,22 +28,19 @@ ExclusiveArch:  %{rust_arches}
 # 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
+#ifarch x86_64
+# FIX: Except on RHEL8 modules, we can't filter a noarch package from shipping
+# on certain arches, namely s390x for its lack of lld. So we need to make it an
+# arch-specific package only for the supported arches.
+%ifnarch s390x
 %if 0%{?fedora}
 %global mingw_targets i686-pc-windows-gnu x86_64-pc-windows-gnu
 %endif
-# NB: wasm32-wasi is being gradually replaced by wasm32-wasip1
-# https://blog.rust-lang.org/2024/04/09/updates-to-rusts-wasi-targets.html
-%global wasm_targets wasm32-unknown-unknown wasm32-wasi wasm32-wasip1
+%global wasm_targets wasm32-unknown-unknown wasm32-wasi
 %if 0%{?fedora} || 0%{?rhel} >= 10
 %global extra_targets x86_64-unknown-none x86_64-unknown-uefi
 %endif
 %endif
-%ifarch aarch64
-%if 0%{?fedora} || 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(string.find(rpm.expand(" %{all_targets} "), rpm.expand(" %1 "), 1, true) or 0)
@@ -51,8 +48,10 @@ ExclusiveArch:  %{rust_arches}
 
 # We need CRT files for *-wasi targets, at least as new as the commit in
 # src/ci/docker/host-x86_64/dist-various-2/build-wasi-toolchain.sh
+# (updated per https://github.com/rust-lang/rust/pull/96907)
 %global wasi_libc_url https://github.com/WebAssembly/wasi-libc
-%global wasi_libc_ref wasi-sdk-22
+#global wasi_libc_ref wasi-sdk-20
+%global wasi_libc_ref bd950eb128bff337153de217b11270f948d04bb4
 %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}
@@ -66,33 +65,22 @@ ExclusiveArch:  %{rust_arches}
 %bcond_with llvm_static
 
 # We can also choose to just use Rust's bundled LLVM, in case the system LLVM
-# is insufficient.  Rust currently requires LLVM 17.0+.
-%global min_llvm_version 17.0.0
-%global bundled_llvm_version 18.1.7
-#global llvm_compat_version 17
-%global llvm llvm%{?llvm_compat_version}
+# is insufficient.  Rust currently requires LLVM 15.0+.
+%global min_llvm_version 15.0.0
+%global bundled_llvm_version 17.0.5
 %bcond_with bundled_llvm
 
 # Requires stable libgit2 1.7, and not the next minor soname change.
 # This needs to be consistent with the bindings in vendor/libgit2-sys.
-%global min_libgit2_version 1.7.2
+%global min_libgit2_version 1.7.1
 %global next_libgit2_version 1.8.0~
-%global bundled_libgit2_version 1.7.2
+%global bundled_libgit2_version 1.7.1
 %if 0%{?fedora} >= 39
 %bcond_with bundled_libgit2
 %else
 %bcond_without bundled_libgit2
 %endif
 
-# Cargo uses UPSERTs with omitted conflict targets
-%global min_sqlite3_version 3.35
-%global bundled_sqlite3_version 3.45.0
-%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
@@ -100,27 +88,10 @@ 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
+# Disable PGO on 32-bit to reduce build memory
 %bcond_with rustc_pgo
 %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
 %endif
 
@@ -151,27 +122,16 @@ Patch3:         0001-Let-environment-variables-override-some-default-CPUs.patch
 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.79.0-unbundle-sqlite.patch
-
-# https://github.com/rust-lang/rust/pull/124597
-Patch7:         0001-Use-an-explicit-x86-64-cpu-in-tests-that-are-sensiti.patch
-
-# Fix codegen test failure on big endian: https://github.com/rust-lang/rust/pull/126263
-Patch8:         0001-Make-issue-122805.rs-big-endian-compatible.patch
-
-# https://github.com/rust-lang/rust/pull/128271
-Patch9:         0001-Disable-jump-threading-of-float-equality.patch
+# https://github.com/rust-lang/rust/pull/117982
+Patch6:         0001-bootstrap-only-show-PGO-warnings-when-verbose.patch
 
 ### RHEL-specific patches below ###
 
 # Simple rpm macros for rust-toolset (as opposed to full rust-packaging)
 Source100:      macros.rust-toolset
-Source101:      cargo_vendor.attr
-Source102:      cargo_vendor.prov
 
 # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949)
-Patch100:       rustc-1.79.0-disable-libssh2.patch
+Patch100:       rustc-1.75.0-disable-libssh2.patch
 
 # Get the Rust triple for any arch.
 %{lua: function rust_triple(arch)
@@ -247,10 +207,6 @@ BuildRequires:  pkgconfig(zlib)
 BuildRequires:  (pkgconfig(libgit2) >= %{min_libgit2_version} with pkgconfig(libgit2) < %{next_libgit2_version})
 %endif
 
-%if %{without bundled_sqlite3}
-BuildRequires:  pkgconfig(sqlite3) >= %{min_sqlite3_version}
-%endif
-
 %if %{without disabled_libssh2}
 BuildRequires:  pkgconfig(libssh2)
 %endif
@@ -268,9 +224,10 @@ BuildRequires:  ninja-build
 Provides:       bundled(llvm) = %{bundled_llvm_version}
 %else
 BuildRequires:  cmake >= 3.5.1
-%if %defined llvm_compat_version
+%if %defined llvm
 %global llvm_root %{_libdir}/%{llvm}
 %else
+%global llvm llvm
 %global llvm_root %{_prefix}
 %endif
 BuildRequires:  %{llvm}-devel >= %{min_llvm_version}
@@ -315,14 +272,6 @@ Requires:       /usr/bin/cc
 # support custom-derive plugins like #[proc_macro_derive(Foo)].
 %global _find_debuginfo_opts --keep-section .rustc
 
-# 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}
-
 %if %{without bundled_llvm}
 %if "%{llvm_root}" == "%{_prefix}" || 0%{?scl:1}
 %global llvm_has_filecheck 1
@@ -352,10 +301,15 @@ BuildRequires:  clang
 BuildRequires:  wasi-libc-static
 %endif
 BuildRequires:  lld
+# brp-strip-static-archive breaks the archive index for wasm
+%global __os_install_post \
+%__os_install_post \
+find '%{buildroot}%{rustlibdir}'/wasm*/lib -type f -regex '.*\\.\\(a\\|rlib\\)' -print -exec '%{llvm_root}/bin/llvm-ranlib' '{}' ';' \
+%{nil}
 %endif
 
 # For profiler_builtins
-BuildRequires:  compiler-rt%{?llvm_compat_version}
+BuildRequires:  compiler-rt
 
 # This component was removed as of Rust 1.69.0.
 # https://github.com/rust-lang/rust/pull/101841
@@ -413,7 +367,8 @@ BuildArch:      noarch
 %if %target_enabled wasm32-unknown-unknown
 %target_package wasm32-unknown-unknown
 Requires:       lld >= 8.0
-BuildArch:      noarch
+# FIX: we can't be noarch while excluding s390x for lack of lld
+# BuildArch:      noarch
 %target_description wasm32-unknown-unknown WebAssembly
 %endif
 
@@ -425,22 +380,11 @@ Provides:       bundled(wasi-libc)
 %else
 Requires:       wasi-libc-static
 %endif
-BuildArch:      noarch
+# FIX: we can't be noarch while excluding s390x for lack of lld
+# BuildArch:      noarch
 %target_description wasm32-wasi WebAssembly
 %endif
 
-%if %target_enabled wasm32-wasip1
-%target_package wasm32-wasip1
-Requires:       lld >= 8.0
-%if %with bundled_wasi_libc
-Provides:       bundled(wasi-libc)
-%else
-Requires:       wasi-libc-static
-%endif
-BuildArch:      noarch
-%target_description wasm32-wasip1 WebAssembly
-%endif
-
 %if %target_enabled x86_64-unknown-none
 %target_package x86_64-unknown-none
 Requires:       lld
@@ -453,12 +397,6 @@ 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
-%endif
-
 
 %package debugger-common
 Summary:        Common debugger pretty printers for Rust
@@ -514,9 +452,6 @@ 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}
-%endif
 # For tests:
 BuildRequires:  git-core
 # Cargo is not much use without Rust
@@ -632,12 +567,7 @@ rm -rf %{wasi_libc_dir}/dlmalloc/
 %if %without bundled_wasi_libc
 %patch -P5 -p1
 %endif
-%if %without bundled_sqlite3
 %patch -P6 -p1
-%endif
-%patch -P7 -p1
-%patch -P8 -p1
-%patch -P9 -p1
 
 %if %with disabled_libssh2
 %patch -P100 -p1
@@ -662,7 +592,6 @@ mkdir -p src/llvm-project/libunwind/
 %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-*/
@@ -672,10 +601,6 @@ mkdir -p src/llvm-project/libunwind/
 %clear_dir vendor/libgit2-sys*/libgit2/
 %endif
 
-%if %without bundled_sqlite3
-%clear_dir vendor/libsqlite3-sys*/sqlite3/
-%endif
-
 %if %with disabled_libssh2
 rm -rf vendor/libssh2-sys*/
 %endif
@@ -719,19 +644,27 @@ find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+'
   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_sqlite3:LIBSQLITE3_SYS_USE_PKG_CONFIG=1}
-  %{!?with_disabled_libssh2:LIBSSH2_SYS_USE_PKG_CONFIG=1}
-}
-%global export_rust_env export %{rust_env}
+# Set up shared environment variables for build/install/check
+%global rust_env %{?rustflags:RUSTFLAGS="%{rustflags}"} %{rustc_target_cpus}
+%if %without disabled_libssh2
+# convince libssh2-sys to use the distro libssh2
+%global rust_env %{?rust_env} LIBSSH2_SYS_USE_PKG_CONFIG=1
+%endif
+%global export_rust_env %{?rust_env:export %{rust_env}}
 
 %build
 %{export_rust_env}
 
+%ifarch %{arm} %{ix86}
+# full debuginfo and compiler opts are exhausting memory; just do libstd for now
+# https://github.com/rust-lang/rust/issues/45854
+%define enable_debuginfo --debuginfo-level=0 --debuginfo-level-std=2
+%define enable_rust_opts --set rust.codegen-units-std=1
+%else
+%define enable_debuginfo --debuginfo-level=2
+%define enable_rust_opts --set rust.codegen-units=1 --set rust.lto=thin
+%endif
+
 # Some builders have relatively little memory for their CPU count.
 # At least 2GB per CPU is a good rule of thumb for building rustc.
 ncpus=$(/usr/bin/getconf _NPROCESSORS_ONLN)
@@ -757,39 +690,26 @@ fi
 
 %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-wasi
-%make_build --quiet -C %{wasi_libc_dir} %{wasi_libc_flags} TARGET_TRIPLE=wasm32-wasip1
-%define wasm_target_config %{shrink:
-  --set target.wasm32-wasi.wasi-root=%{wasi_libc_dir}/sysroot
-  --set target.wasm32-wasip1.wasi-root=%{wasi_libc_dir}/sysroot
-}
+%make_build --quiet -C %{wasi_libc_dir} MALLOC_IMPL=emmalloc CC=clang AR=llvm-ar NM=llvm-nm
+%define wasm_target_config --set target.wasm32-wasi.wasi-root=%{wasi_libc_dir}/sysroot
 %else
 %define wasm_target_config %{shrink:
   --set target.wasm32-wasi.wasi-root=%{_prefix}/wasm32-wasi
   --set target.wasm32-wasi.self-contained=false
-  --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 crate.
-%if %defined llvm_compat_version
-# clang_resource_dir is not defined for compat builds.
-%define profiler /usr/lib/clang/%{llvm_compat_version}/lib/%{_arch}-redhat-linux-gnu/libclang_rt.profile.a
-%else
 %if 0%{?clang_major_version} >= 17
 %define profiler %{clang_resource_dir}/lib/%{_arch}-redhat-linux-gnu/libclang_rt.profile.a
 %else
 # The exact profiler path is version dependent..
 %define profiler %(echo %{_libdir}/clang/??/lib/libclang_rt.profile-*.a)
 %endif
-%endif
 test -r "%{profiler}"
 
 %configure --disable-option-checking \
-  --docdir=%{_pkgdocdir} \
   --libdir=%{common_libdir} \
   --build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple} \
   --set target.%{rust_triple}.linker=%{__cc} \
@@ -814,41 +734,40 @@ test -r "%{profiler}"
   --set build.doc-stage=2 \
   --set build.install-stage=2 \
   --set build.test-stage=2 \
-  --set build.optimized-compiler-builtins=false \
   --enable-extended \
   --tools=cargo,clippy,rls,rust-analyzer,rustfmt,src \
   --enable-vendor \
   --enable-verbose-tests \
+  --dist-compression-formats=gz \
   --release-channel=%{channel} \
   --release-description="%{?fedora:Fedora }%{?rhel:Red Hat }%{version}-%{release}"
 
 %global __x %{__python3} ./x.py
+%global __xk %{__x} --keep-stage=0 --keep-stage=1
 
 %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 -j "$ncpus" sysroot --rust-profile-generate="%{profraw}"
+PROFRAW="$PWD/build/profiles"
+PROFDATA="$PWD/build/rustc.profdata"
+mkdir -p "$PROFRAW"
+%{__x} build -j "$ncpus" sysroot --rust-profile-generate="$PROFRAW"
 # Build cargo as a workload to generate compiler profiles
-env LLVM_PROFILE_FILE="%{profraw}/default_%%m_%%p.profraw" \
-  %{__x} --keep-stage=0 --keep-stage=1 build cargo
-# Finalize the profile data and clean up the raw files
-%{llvm_root}/bin/llvm-profdata merge -o "%{profdata}" "%{profraw}"
-rm -r "%{profraw}" build/%{rust_triple}/stage2*/
-# Redefine the macro to use that profile data from now on
-%global __x %{__x} --rust-profile-use="%{profdata}"
+env LLVM_PROFILE_FILE="$PROFRAW/default_%%m_%%p.profraw" %{__xk} build cargo
+llvm-profdata merge -o "$PROFDATA" "$PROFRAW"
+rm -r "$PROFRAW" build/%{rust_triple}/stage2*/
+# Rebuild the compiler using the profile data
+%{__x} build -j "$ncpus" sysroot --rust-profile-use="$PROFDATA"
+%else
+# Build the compiler without PGO
+%{__x} build -j "$ncpus" sysroot
 %endif
 
-# Build the compiler normally (with or without PGO)
-%{__x} build -j "$ncpus" sysroot
-
 # Build everything else normally
-%{__x} build
-%{__x} doc
+%{__xk} build
+%{__xk} doc
 
 for triple in %{?all_targets} ; do
-  %{__x} build --target=$triple std
+  %{__xk} build --target=$triple std
 done
 
 %install
@@ -857,10 +776,10 @@ done
 %endif
 %{export_rust_env}
 
-DESTDIR=%{buildroot} %{__x} install
+DESTDIR=%{buildroot} %{__xk} install
 
 for triple in %{?all_targets} ; do
-  DESTDIR=%{buildroot} %{__x} install --target=$triple std
+  DESTDIR=%{buildroot} %{__xk} install --target=$triple std
 done
 
 # The rls stub doesn't have an install target, but we can just copy it.
@@ -906,18 +825,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
@@ -933,8 +855,6 @@ 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}%{_fileattrsdir}/cargo_vendor.attr
-%{__install} -D -m 755 %{S:102} %{buildroot}%{_rpmconfigdir}/cargo_vendor.prov
 %endif
 
 
@@ -969,21 +889,17 @@ rm -rf "$TMP_HELLO"
 
 # Bootstrap is excluded because it's not something we ship, and a lot of its
 # tests are geared toward the upstream CI environment.
-timeout -v 90m %{__x} test --no-fail-fast --skip src/bootstrap || :
+timeout -v 90m %{__xk} test --no-fail-fast --skip src/bootstrap || :
 rm -rf "./build/%{rust_triple}/test/"
 
-%ifarch aarch64
-# https://github.com/rust-lang/rust/issues/123733
-%define cargo_test_skip --test-args "--skip panic_abort_doc_tests"
-%endif
-timeout -v 30m %{__x} test --no-fail-fast cargo %{?cargo_test_skip} || :
+timeout -v 30m %{__xk} test --no-fail-fast cargo || :
 rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 
-timeout -v 30m %{__x} test --no-fail-fast clippy || :
+timeout -v 30m %{__xk} test --no-fail-fast clippy || :
 
-timeout -v 30m %{__x} test --no-fail-fast rust-analyzer || :
+timeout -v 30m %{__xk} test --no-fail-fast rust-analyzer || :
 
-timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
+timeout -v 30m %{__xk} test --no-fail-fast rustfmt || :
 
 
 %ldconfig_scriptlets
@@ -1044,15 +960,6 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 %endif
 %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
@@ -1061,10 +968,6 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 %target_files x86_64-unknown-uefi
 %endif
 
-%if %target_enabled aarch64-unknown-none-softfloat
-%target_files aarch64-unknown-none-softfloat
-%endif
-
 
 %files debugger-common
 %dir %{rustlibdir}
@@ -1084,9 +987,9 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 
 
 %files doc
-%docdir %{_pkgdocdir}
-%dir %{_pkgdocdir}
-%{_pkgdocdir}/html
+%docdir %{_docdir}/%{name}
+%dir %{_docdir}/%{name}
+%{_docdir}/%{name}/html
 # former cargo-doc
 %docdir %{_docdir}/cargo
 %dir %{_docdir}/cargo
@@ -1133,29 +1036,10 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || :
 %if 0%{?rhel}
 %files toolset
 %{rpmmacrodir}/macros.rust-toolset
-%{_fileattrsdir}/cargo_vendor.attr
-%{_rpmconfigdir}/cargo_vendor.prov
 %endif
 
 
 %changelog
-* Tue Aug 13 2024 Josh Stone <jistone@redhat.com> - 1.79.0-2
-- Disable jump threading of float equality
-
-* Fri Jun 21 2024 Josh Stone <jistone@redhat.com> - 1.79.0-1
-- Update to 1.79.0
-
-* Fri Jun 21 2024 Josh Stone <jistone@redhat.com> - 1.78.0-1
-- Update to 1.78.0
-- Make std-static-wasm* noarch again
-
-* Thu May 09 2024 Josh Stone <jistone@redhat.com> - 1.77.2-1
-- Update to 1.77.2.
-
-* Wed Apr 17 2024 Josh Stone <jistone@redhat.com> - 1.76.0-1
-- Update to 1.76.0.
-- Sync rust-toolset macros to rust-packaging v25.2
-
 * Fri Jan 05 2024 Josh Stone <jistone@redhat.com> - 1.75.0-1
 - Update to 1.75.0.