diff --git a/0001-Use-lld-provided-by-system.patch b/0001-Use-lld-provided-by-system.patch index a2df2e938daf7db5eee1451ade5043834629357f..97983e8528e00a5d800b63fa86e0644791c58f85 100644 --- a/0001-Use-lld-provided-by-system.patch +++ b/0001-Use-lld-provided-by-system.patch @@ -1,16 +1,16 @@ -From e9405caf32dfb31bf17c3da0299df515a3755107 Mon Sep 17 00:00:00 2001 +From d2fa68624463426e82f2ba19703159a46867384b 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 +- + .../src/spec/targets/aarch64_unknown_none_softfloat.rs | 1 - 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(-) - + 5 files changed, 4 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 @@ -26,20 +26,19 @@ index 7ede45766ea..b22362227bb 100644 pre_link_args, diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs -index 35a4dd72b86..a9c8fc5edb8 100644 +index ad444c139bf..f5f8f18f8b8 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 { +@@ -15,7 +15,6 @@ pub(crate) fn target() -> Target { let opts = TargetOptions { - abi: "softfloat".into(), + abi: Abi::SoftFloat, 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(), + features: "+v8a,+strict-align,-neon".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 +index e2c1888e408..4869f85d1e6 100644 --- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs +++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs @@ -9,6 +9,7 @@ pub(crate) fn target() -> Target { @@ -51,7 +50,7 @@ index 327b52389b9..17313d7e8b3 100644 Target { llvm_target: "aarch64-unknown-windows".into(), diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs -index 1a6343595f5..8015b082cd1 100644 +index 520a59d6a6f..1606618b683 100644 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs @@ -19,7 +19,7 @@ pub(crate) fn target() -> Target { @@ -64,7 +63,7 @@ index 1a6343595f5..8015b082cd1 100644 features: "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,+soft-float".into(), supported_sanitizers: SanitizerSet::KCFI | SanitizerSet::KERNELADDRESS, diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs -index 0cf6a879462..3677fc662de 100644 +index 8a494d0e56d..d2f4f3f42b4 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 { @@ -76,4 +75,4 @@ index 0cf6a879462..3677fc662de 100644 // We disable MMX and SSE for now, even though UEFI allows using them. Problem is, you have to // enable these CPU features explicitly before their first use, otherwise their instructions -- -2.51.0 +2.51.1 diff --git a/rust.spec b/rust.spec index 687d88e27c7f57278a6cdb3a4086d9a992112806..9b63c9c3dc873e42a8170a782bda372f94e1c644 100644 --- a/rust.spec +++ b/rust.spec @@ -1,7 +1,7 @@ # bootstrap from scratch, set the channel and date from src/stage0.json -%global bootstrap_version 1.91.0 -%global bootstrap_channel 1.91.0 -%global bootstrap_date 2025-10-30 +%global bootstrap_version 1.92.0 +%global bootstrap_channel 1.92.0 +%global bootstrap_date 2025-12-11 # only the specified arch will use the bootstrap binary # run spectool -g rust.spec to get the tarball. @@ -18,7 +18,7 @@ %global bundled_libgit2_version 1.9.1 %global min_llvm_version 20.0.0 -%global bundled_llvm_version 21.1.3 +%global bundled_llvm_version 21.1.5 %bcond_without bundled_llvm %bcond_with llvm_static @@ -118,7 +118,7 @@ end} Summary: The Rust Programming Language Name: rust -Version: 1.92.0 +Version: 1.93.0 Release: 1%{?dist} License: (ASL 2.0 or MIT) and (BSD and MIT) URL: https://www.rust-lang.org @@ -619,6 +619,10 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/" %{rustlibdir}/src %changelog +* Thu Jun 4 2026 Wang Guodong - 1.93.0-1 +- [Type] enhancement +- [DESC] Upgrade to 1.93.0 + * Mon Jun 1 2026 Wang Guodong - 1.92.0-1 - [Type] enhancement - [DESC] Upgrade to 1.92.0 diff --git a/rustc-1.76.0-unbundle-sqlite.patch b/rustc-1.76.0-unbundle-sqlite.patch index 3d5e834e5186b547b4d67df2f89ac5b09f63369d..67cf4b7837345e6a14093d8250f8b60fe53f0479 100644 --- a/rustc-1.76.0-unbundle-sqlite.patch +++ b/rustc-1.76.0-unbundle-sqlite.patch @@ -1,8 +1,7 @@ -diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock ---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2025-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" +--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2025-12-18 15:09:44.157650741 -0600 ++++ rustc-beta-src/src/tools/cargo/Cargo.lock 2025-12-18 15:10:14.837395011 -0600 +@@ -2817,7 +2817,6 @@ version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "133c182a6a2c87864fe97778797e46c7e999672690dc9fa3ee8e241aa4a9c13f" dependencies = [ @@ -10,13 +9,12 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools "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" +--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2025-12-18 15:09:57.641723932 -0600 ++++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-12-18 15:10:36.866959259 -0600 +@@ -83,7 +83,7 @@ proptest = "1.9.0" pulldown-cmark = { version = "0.13.0", default-features = false, features = ["html"] } rand = "0.9.2" - regex = "1.11.3" + regex = "1.12.2" -rusqlite = { version = "0.37.0", features = ["bundled"] } +rusqlite = { version = "0.37.0", features = [] } rustc-hash = "2.1.1" diff --git a/sources b/sources index 69bf62278ed6d49e7f2d70cd5955bca2dd095958..e2e4821b8cce4518b9a3aa8899adf0193efe3c8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rustc-1.92.0-src.tar.xz) = a2c0b127933595b9bc2063d7b7c88d9af512c4664b18f29d44c9a6e2c68d194b87a3071717e8f1b7c858ae940baca888e10be95cd31e0201916d0bfc312a3b15 +SHA512 (rustc-1.93.0-src.tar.xz) = 9362a4b56529ce29362e256daf382b73c73204d0e9fe5b39addf07ff66a30aa66c967e34df9021ea007c13a9f3bb6efdefca1c8e4ea1bde9aac050a9fb0c736b