From 4bad654a856321d441b184c5f474db7fcf9ab3c6 Mon Sep 17 00:00:00 2001 From: gordonwwang Date: Mon, 1 Jun 2026 10:42:01 +0800 Subject: [PATCH 1/2] Upgrade to 1.92.0 --- 0001-Use-lld-provided-by-system.patch | 17 ++++++++--------- rust.spec | 5 ++++- rustc-1.76.0-unbundle-sqlite.patch | 15 ++++++++------- sources | 2 +- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/0001-Use-lld-provided-by-system.patch b/0001-Use-lld-provided-by-system.patch index 1e5816b..a2df2e9 100644 --- a/0001-Use-lld-provided-by-system.patch +++ b/0001-Use-lld-provided-by-system.patch @@ -1,8 +1,8 @@ -From 0641fdd833785914f1ead6e1ab374beea5b55437 Mon Sep 17 00:00:00 2001 +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 +- @@ -10,14 +10,14 @@ Subject: [PATCH] Use lld provided by system 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 88e7af5e669..14100a683f9 100644 +index 7ede45766ea..b22362227bb 100644 --- a/compiler/rustc_target/src/spec/base/wasm.rs +++ b/compiler/rustc_target/src/spec/base/wasm.rs -@@ -86,8 +86,7 @@ macro_rules! args { - // arguments just yet - limit_rdylib_exports: false, +@@ -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()), @@ -76,5 +76,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.49.0 - +2.51.0 diff --git a/rust.spec b/rust.spec index afdece6..d074a56 100644 --- a/rust.spec +++ b/rust.spec @@ -118,7 +118,7 @@ end} Summary: The Rust Programming Language Name: rust -Version: 1.91.0 +Version: 1.92.0 Release: 1%{?dist} License: (ASL 2.0 or MIT) and (BSD and MIT) URL: https://www.rust-lang.org @@ -619,6 +619,9 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/" %{rustlibdir}/src %changelog +* Mon Jun 1 2026 Wang Guodong - 1.92.0-1 +- Upgrade to 1.92.0 + * Thu Nov 13 2025 Wang Guodong - 1.91.0-1 - Upgrade to 1.91.0 - remove extra llvm flags diff --git a/rustc-1.76.0-unbundle-sqlite.patch b/rustc-1.76.0-unbundle-sqlite.patch index 797cb03..3d5e834 100644 --- a/rustc-1.76.0-unbundle-sqlite.patch +++ b/rustc-1.76.0-unbundle-sqlite.patch @@ -1,7 +1,8 @@ + 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-09-27 05:39:02.000000000 -0700 -+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2025-10-06 09:42:27.244710359 -0700 -@@ -2844,7 +2844,6 @@ version = "0.35.0" +--- 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 = [ @@ -10,12 +11,12 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools "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-09-27 05:39:02.000000000 -0700 -+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2025-10-06 09:42:06.219898468 -0700 -@@ -81,7 +81,7 @@ proptest = "1.7.0" +--- 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.1" + regex = "1.11.3" -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 f067963..69bf622 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rustc-1.91.0-src.tar.xz) = 1e4c7a2435dc5bccfc63f34f5d210f7cafb0113787a4b5069d61f03528a32cd0a29ac516673cbc0eb564089f1dc5e13b962e6c3714bd0109de664c22ed340fb3 +SHA512 (rustc-1.92.0-src.tar.xz) = a2c0b127933595b9bc2063d7b7c88d9af512c4664b18f29d44c9a6e2c68d194b87a3071717e8f1b7c858ae940baca888e10be95cd31e0201916d0bfc312a3b15 -- Gitee From cbd1ec4ae76039d7e4f29fbe3049a5f37855a272 Mon Sep 17 00:00:00 2001 From: gordonwwang Date: Mon, 1 Jun 2026 10:45:15 +0800 Subject: [PATCH 2/2] update changelog --- rust.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/rust.spec b/rust.spec index d074a56..687d88e 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.90.0 -%global bootstrap_channel 1.90.0 -%global bootstrap_date 2025-09-18 +%global bootstrap_version 1.91.0 +%global bootstrap_channel 1.91.0 +%global bootstrap_date 2025-10-30 # 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.1 +%global bundled_llvm_version 21.1.3 %bcond_without bundled_llvm %bcond_with llvm_static @@ -620,7 +620,8 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/" %changelog * Mon Jun 1 2026 Wang Guodong - 1.92.0-1 -- Upgrade to 1.92.0 +- [Type] enhancement +- [DESC] Upgrade to 1.92.0 * Thu Nov 13 2025 Wang Guodong - 1.91.0-1 - Upgrade to 1.91.0 -- Gitee