diff --git a/0001-Fix-enabling-wasm-component-ld-to-match-other-tools.patch b/0001-Fix-enabling-wasm-component-ld-to-match-other-tools.patch
deleted file mode 100644
index 5364012fc7dccf2679e5395a5373a925a95faca2..0000000000000000000000000000000000000000
--- a/0001-Fix-enabling-wasm-component-ld-to-match-other-tools.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-From c15469a7fec811d1a4f69ff26e18c6f383df41d2 Mon Sep 17 00:00:00 2001
-From: Alex Crichton <alex@alexcrichton.com>
-Date: Fri, 6 Sep 2024 09:21:33 -0700
-Subject: [PATCH] Fix enabling wasm-component-ld to match other tools
-
-It was [pointed out recently][comment] that enabling `wasm-component-ld`
-as a host tool is different from other host tools. This commit refactors
-the logic to match by deduplicating selection of when to build other
-tools and then using the same logic for `wasm-component-ld`.
-
-[comment]: https://github.com/rust-lang/rust/pull/127866#issuecomment-2333434720
----
- src/bootstrap/src/core/build_steps/compile.rs |  2 +-
- src/bootstrap/src/core/build_steps/dist.rs    |  2 +-
- src/bootstrap/src/core/build_steps/tool.rs    | 38 +++----------------
- src/bootstrap/src/lib.rs                      | 17 +++++----
- 4 files changed, 17 insertions(+), 42 deletions(-)
-
-diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
-index 1936c91ef83c..102c9fd25543 100644
---- a/src/bootstrap/src/core/build_steps/compile.rs
-+++ b/src/bootstrap/src/core/build_steps/compile.rs
-@@ -1912,7 +1912,7 @@ fn run(self, builder: &Builder<'_>) -> Compiler {
-         // delegates to the `rust-lld` binary for linking and then runs
-         // logic to create the final binary. This is used by the
-         // `wasm32-wasip2` target of Rust.
--        if builder.build_wasm_component_ld() {
-+        if builder.tool_enabled("wasm-component-ld") {
-             let wasm_component_ld_exe =
-                 builder.ensure(crate::core::build_steps::tool::WasmComponentLd {
-                     compiler: build_compiler,
-diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
-index 4957de2e1b79..ccb5656d6716 100644
---- a/src/bootstrap/src/core/build_steps/dist.rs
-+++ b/src/bootstrap/src/core/build_steps/dist.rs
-@@ -473,7 +473,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) {
-                     );
-                 }
-             }
--            if builder.build_wasm_component_ld() {
-+            if builder.tool_enabled("wasm-component-ld") {
-                 let src_dir = builder.sysroot_libdir(compiler, host).parent().unwrap().join("bin");
-                 let ld = exe("wasm-component-ld", compiler.host);
-                 builder.copy_link(&src_dir.join(&ld), &dst_dir.join(&ld));
-diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs
-index 3a1eb43b801f..3c2d791c2090 100644
---- a/src/bootstrap/src/core/build_steps/tool.rs
-+++ b/src/bootstrap/src/core/build_steps/tool.rs
-@@ -693,14 +693,7 @@ impl Step for Cargo {
- 
-     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-         let builder = run.builder;
--        run.path("src/tools/cargo").default_condition(
--            builder.config.extended
--                && builder.config.tools.as_ref().map_or(
--                    true,
--                    // If `tools` is set, search list for this tool.
--                    |tools| tools.iter().any(|tool| tool == "cargo"),
--                ),
--        )
-+        run.path("src/tools/cargo").default_condition(builder.tool_enabled("cargo"))
-     }
- 
-     fn make_run(run: RunConfig<'_>) {
-@@ -772,14 +765,7 @@ impl Step for RustAnalyzer {
- 
-     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-         let builder = run.builder;
--        run.path("src/tools/rust-analyzer").default_condition(
--            builder.config.extended
--                && builder
--                    .config
--                    .tools
--                    .as_ref()
--                    .map_or(true, |tools| tools.iter().any(|tool| tool == "rust-analyzer")),
--        )
-+        run.path("src/tools/rust-analyzer").default_condition(builder.tool_enabled("rust-analyzer"))
-     }
- 
-     fn make_run(run: RunConfig<'_>) {
-@@ -821,12 +807,8 @@ fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-         run.path("src/tools/rust-analyzer")
-             .path("src/tools/rust-analyzer/crates/proc-macro-srv-cli")
-             .default_condition(
--                builder.config.extended
--                    && builder.config.tools.as_ref().map_or(true, |tools| {
--                        tools.iter().any(|tool| {
--                            tool == "rust-analyzer" || tool == "rust-analyzer-proc-macro-srv"
--                        })
--                    }),
-+                builder.tool_enabled("rust-analyzer")
-+                    || builder.tool_enabled("rust-analyzer-proc-macro-srv"),
-             )
-     }
- 
-@@ -874,16 +856,8 @@ impl Step for LlvmBitcodeLinker {
- 
-     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-         let builder = run.builder;
--        run.path("src/tools/llvm-bitcode-linker").default_condition(
--            builder.config.extended
--                && builder
--                    .config
--                    .tools
--                    .as_ref()
--                    .map_or(builder.build.unstable_features(), |tools| {
--                        tools.iter().any(|tool| tool == "llvm-bitcode-linker")
--                    }),
--        )
-+        run.path("src/tools/llvm-bitcode-linker")
-+            .default_condition(builder.tool_enabled("llvm-bitcode-linker"))
-     }
- 
-     fn make_run(run: RunConfig<'_>) {
-diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
-index c76ce3409562..780024e307ed 100644
---- a/src/bootstrap/src/lib.rs
-+++ b/src/bootstrap/src/lib.rs
-@@ -1407,16 +1407,17 @@ fn default_wasi_runner(&self) -> Option<String> {
-         None
-     }
- 
--    /// Returns whether it's requested that `wasm-component-ld` is built as part
--    /// of the sysroot. This is done either with the `extended` key in
--    /// `config.toml` or with the `tools` set.
--    fn build_wasm_component_ld(&self) -> bool {
--        if self.config.extended {
--            return true;
-+    /// Returns whether the specified tool is configured as part of this build.
-+    ///
-+    /// This requires that both the `extended` key is set and the `tools` key is
-+    /// either unset or specifically contains the specified tool.
-+    fn tool_enabled(&self, tool: &str) -> bool {
-+        if !self.config.extended {
-+            return false;
-         }
-         match &self.config.tools {
--            Some(set) => set.contains("wasm-component-ld"),
--            None => false,
-+            Some(set) => set.contains(tool),
-+            None => true,
-         }
-     }
- 
--- 
-2.46.0
-
diff --git a/0001-add-support-for-ppc64le.patch b/0001-add-support-for-ppc64le.patch
index dbd1e0e97ed8a9fe58a23c17b081013838bab71b..91289e32ecb43689734d5da47dee631a4a250f2e 100644
--- a/0001-add-support-for-ppc64le.patch
+++ b/0001-add-support-for-ppc64le.patch
@@ -8,19 +8,19 @@ Subject: [PATCH] add support for ppc64le
  .../spec/targets/ppc64le_unknown_freebsd.rs   | 23 +++++++++++++++++++
  .../spec/targets/ppc64le_unknown_linux_gnu.rs | 23 +++++++++++++++++++
  .../targets/ppc64le_unknown_linux_musl.rs     | 23 +++++++++++++++++++
- src/bootstrap/configure.py                    |  2 ++
- vendor/openssl-src-111.28.1+1.1.1w/src/lib.rs |  3 +++
- vendor/target-lexicon-0.12.15/src/targets.rs  |  3 +++
- 7 files changed, 79 insertions(+)
+ src/bootstrap/configure.py                    |  5 ++++
+ vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs |  3 +++
+ vendor/target-lexicon-0.12.16/src/targets.rs  |  3 +++
+ 7 files changed, 82 insertions(+)
  create mode 100644 compiler/rustc_target/src/spec/targets/ppc64le_unknown_freebsd.rs
  create mode 100644 compiler/rustc_target/src/spec/targets/ppc64le_unknown_linux_gnu.rs
  create mode 100644 compiler/rustc_target/src/spec/targets/ppc64le_unknown_linux_musl.rs
 
 diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
-index 291a761..e6e80a1 100644
+index 02962d55a..075d4fbb8 100644
 --- a/compiler/rustc_target/src/spec/mod.rs
 +++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -1513,6 +1513,8 @@ supported_targets! {
+@@ -1675,6 +1675,8 @@ supported_targets! {
      ("powerpc64-unknown-linux-musl", powerpc64_unknown_linux_musl),
      ("powerpc64le-unknown-linux-gnu", powerpc64le_unknown_linux_gnu),
      ("powerpc64le-unknown-linux-musl", powerpc64le_unknown_linux_musl),
@@ -31,13 +31,13 @@ index 291a761..e6e80a1 100644
      ("sparc-unknown-linux-gnu", sparc_unknown_linux_gnu),
 diff --git a/compiler/rustc_target/src/spec/targets/ppc64le_unknown_freebsd.rs b/compiler/rustc_target/src/spec/targets/ppc64le_unknown_freebsd.rs
 new file mode 100644
-index 0000000..615bb67
+index 000000000..615bb6762
 --- /dev/null
 +++ b/compiler/rustc_target/src/spec/targets/ppc64le_unknown_freebsd.rs
 @@ -0,0 +1,23 @@
 +use crate::spec::{base, Cc, LinkerFlavor, Lld, StackProbeType, Target, TargetOptions};
 +
-+pub fn target() -> Target {
++pub(crate) fn target() -> Target {
 +    let mut base = base::freebsd::opts();
 +    base.cpu = "ppc64le".into();
 +    base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
@@ -60,13 +60,13 @@ index 0000000..615bb67
 +}
 diff --git a/compiler/rustc_target/src/spec/targets/ppc64le_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/ppc64le_unknown_linux_gnu.rs
 new file mode 100644
-index 0000000..5ff45e2
+index 000000000..5ff45e2f4
 --- /dev/null
 +++ b/compiler/rustc_target/src/spec/targets/ppc64le_unknown_linux_gnu.rs
 @@ -0,0 +1,23 @@
 +use crate::spec::{base, Cc, LinkerFlavor, Lld, StackProbeType, Target, TargetOptions};
 +
-+pub fn target() -> Target {
++pub(crate) fn target() -> Target {
 +    let mut base = base::linux_gnu::opts();
 +    base.cpu = "ppc64le".into();
 +    base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
@@ -89,13 +89,13 @@ index 0000000..5ff45e2
 +}
 diff --git a/compiler/rustc_target/src/spec/targets/ppc64le_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/ppc64le_unknown_linux_musl.rs
 new file mode 100644
-index 0000000..2b612e7
+index 000000000..2b612e76f
 --- /dev/null
 +++ b/compiler/rustc_target/src/spec/targets/ppc64le_unknown_linux_musl.rs
 @@ -0,0 +1,23 @@
 +use crate::spec::{base, Cc, LinkerFlavor, Lld, StackProbeType, Target, TargetOptions};
 +
-+pub fn target() -> Target {
++pub(crate) fn target() -> Target {
 +    let mut base = base::linux_musl::opts();
 +    base.cpu = "ppc64le".into();
 +    base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
@@ -117,23 +117,26 @@ index 0000000..2b612e7
 +    }
 +}
 diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
-index 768aac9..155f21e 100755
+index a86c20d46..7ea1a9666 100755
 --- a/src/bootstrap/configure.py
 +++ b/src/bootstrap/configure.py
-@@ -127,6 +127,8 @@ v("musl-root-mips64", "target.mips64-unknown-linux-muslabi64.musl-root",
-   "mips64-unknown-linux-muslabi64 install directory")
- v("musl-root-mips64el", "target.mips64el-unknown-linux-muslabi64.musl-root",
-   "mips64el-unknown-linux-muslabi64 install directory")
-+v("musl-root-ppc64le", "target.ppc64le-unknown-linux-musl.musl-root",
-+  "ppc64le-unknown-linux-musl install directory")
- v("musl-root-riscv32gc", "target.riscv32gc-unknown-linux-musl.musl-root",
-   "riscv32gc-unknown-linux-musl install directory")
- v("musl-root-riscv64gc", "target.riscv64gc-unknown-linux-musl.musl-root",
+@@ -250,6 +250,11 @@ v(
+     "target.powerpc64le-unknown-linux-musl.musl-root",
+     "powerpc64le-unknown-linux-musl install directory",
+ )
++v(
++    "musl-root-ppc64le",
++    "target.ppc64le-unknown-linux-musl.musl-root",
++    "ppc64le-unknown-linux-musl install directory",
++)
+ v(
+     "musl-root-riscv32gc",
+     "target.riscv32gc-unknown-linux-musl.musl-root",
 diff --git a/vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs b/vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs
-index 1264742..14427a7 100644
+index 1ef018081..44308dcdc 100644
 --- a/vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs
 +++ b/vendor/openssl-src-111.28.2+1.1.1w/src/lib.rs
-@@ -282,6 +282,9 @@ impl Build {
+@@ -283,6 +283,9 @@ impl Build {
              "powerpc64le-unknown-freebsd" => "BSD-generic64",
              "powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
              "powerpc64le-unknown-linux-musl" => "linux-ppc64le",
@@ -143,11 +146,11 @@ index 1264742..14427a7 100644
              "riscv64gc-unknown-linux-gnu" => "linux-generic64",
              "s390x-unknown-linux-gnu" => "linux64-s390x",
              "s390x-unknown-linux-musl" => "linux64-s390x",
-diff --git a/vendor/target-lexicon-0.12.15/src/targets.rs b/vendor/target-lexicon-0.12.15/src/targets.rs
-index d14a7607b..f64e49568 100644
---- a/vendor/target-lexicon-0.12.15/src/targets.rs
-+++ b/vendor/target-lexicon-0.12.15/src/targets.rs
-@@ -1692,6 +1692,9 @@ mod tests {
+diff --git a/vendor/target-lexicon-0.12.16/src/targets.rs b/vendor/target-lexicon-0.12.16/src/targets.rs
+index 997c673e6..439899f67 100644
+--- a/vendor/target-lexicon-0.12.16/src/targets.rs
++++ b/vendor/target-lexicon-0.12.16/src/targets.rs
+@@ -1701,6 +1701,9 @@ mod tests {
              "powerpc64le-unknown-freebsd",
              "powerpc64le-unknown-linux-gnu",
              "powerpc64le-unknown-linux-musl",
@@ -158,5 +161,5 @@ index d14a7607b..f64e49568 100644
              "powerpc64-unknown-linux-gnu",
              "powerpc64-unknown-linux-musl",
 -- 
-2.44.0
+2.48.1
 
diff --git a/0001-fix-build-error-for-loongarch64.patch b/0001-fix-build-error-for-loongarch64.patch
deleted file mode 100644
index 4acb4e864593f150069b44ad50f88026478aa433..0000000000000000000000000000000000000000
--- a/0001-fix-build-error-for-loongarch64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/vendor/compiler_builtins-0.1.123/configure.rs
-+++ b/vendor/compiler_builtins-0.1.123/configure.rs
-@@ -72,6 +72,8 @@ pub fn configure_f16_f128(target: &Target) {
-         "sparc" | "sparcv9" => (true, false),
-         // `f16` miscompiles <https://github.com/llvm/llvm-project/issues/96438>
-         "wasm32" | "wasm64" => (false, true),
-+        "loongarch64" => (false, true),
-+        "riscv64" | "riscv64gc" => (false, true),
-         // Most everything else works as of LLVM 19
-         _ => (true, true),
-     };
diff --git a/rust-1.82.0-x86_64-unknown-linux-gnu.tar.xz b/rust-1.84.0-aarch64-unknown-linux-gnu.tar.xz
similarity index 32%
rename from rust-1.82.0-x86_64-unknown-linux-gnu.tar.xz
rename to rust-1.84.0-aarch64-unknown-linux-gnu.tar.xz
index e92b3a3207c271cd5705a29645f79596ec1b77fd..30844a84c24be52d619836af87b0f910541bea52 100644
--- a/rust-1.82.0-x86_64-unknown-linux-gnu.tar.xz
+++ b/rust-1.84.0-aarch64-unknown-linux-gnu.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a6bf24ca1fee2bd861590431c7954674191a0c0dfa0af4169731bc1459cf58a
-size 178075016
+oid sha256:c535d4eb461a361fcaaad98ce578b5846e1a0bd3ff6939874a3e9cbe72cfae17
+size 241841868
diff --git a/rustc-1.82.0-src.tar.xz b/rust-1.84.0-loongarch64-unknown-linux-gnu.tar.xz
similarity index 32%
rename from rustc-1.82.0-src.tar.xz
rename to rust-1.84.0-loongarch64-unknown-linux-gnu.tar.xz
index c83dcc00264eb4cb3ca9eb26421300f348823b0f..985b2ab596d7f9e32835a6b468937d6423dd1eef 100644
--- a/rustc-1.82.0-src.tar.xz
+++ b/rust-1.84.0-loongarch64-unknown-linux-gnu.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1276a0bb8fa12288ba6fa96597d28b40e74c44257c051d3bc02c2b049bb38210
-size 219769328
+oid sha256:08bbf2dced82481edfe7d14ab170f90dc7e326511f39641eb8c428b1376d2990
+size 234981212
diff --git a/rust-1.82.0-aarch64-unknown-linux-gnu.tar.xz b/rust-1.84.0-riscv64gc-unknown-linux-gnu.tar.xz
similarity index 32%
rename from rust-1.82.0-aarch64-unknown-linux-gnu.tar.xz
rename to rust-1.84.0-riscv64gc-unknown-linux-gnu.tar.xz
index 5e0f13e21f96c61760f231e94a90bdfb625a8cfc..756b4b55ada61b13cf7d7c71469ed5f73a452d7b 100644
--- a/rust-1.82.0-aarch64-unknown-linux-gnu.tar.xz
+++ b/rust-1.84.0-riscv64gc-unknown-linux-gnu.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:99acf175be33bd96ac82d644125d0e2acc6962d61ee64851edc7d8ba3bd23ca4
-size 236675048
+oid sha256:74e0a75cb6d48975c75cf49b5434c921d6bed16937e1f6091eaffb524761c6e1
+size 221099540
diff --git a/rust-1.82.0-riscv64gc-unknown-linux-gnu.tar.xz b/rust-1.84.0-x86_64-unknown-linux-gnu.tar.xz
similarity index 32%
rename from rust-1.82.0-riscv64gc-unknown-linux-gnu.tar.xz
rename to rust-1.84.0-x86_64-unknown-linux-gnu.tar.xz
index 3c3cd4f2bf50138272fd00027b72f311ac901a65..87f6f3cd8436eff3cb8686774327530710e319bc 100644
--- a/rust-1.82.0-riscv64gc-unknown-linux-gnu.tar.xz
+++ b/rust-1.84.0-x86_64-unknown-linux-gnu.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:532190c3cdbdee9249bcde648b1c61b092bdd8885266ba9edd6df6824a454958
-size 217304308
+oid sha256:73aca7e08720b7bf28beee8f2370c6aef961aa87e9674989f5ce62ec2f95dcfd
+size 183288052
diff --git a/rust.spec b/rust.spec
index af7ad1f5e6cc0d6a9ca1136f05e08d40bca30def..9c540aebb3801156b353f67e7d751c4a6a9db4c9 100644
--- a/rust.spec
+++ b/rust.spec
@@ -1,10 +1,14 @@
-%global bootstrap_rust 1.82.0
-%global bootstrap_cargo 1.82.0
-%global bootstrap_channel 1.82.0
-%global bootstrap_date 2024-06-13
+%global bootstrap_rust 1.84.0
+%global bootstrap_cargo 1.84.0
+%global bootstrap_channel 1.84.0
+%global bootstrap_date 2025-01-09
 %global bootstrap_arches x86_64 aarch64 riscv64
 %bcond_with llvm_static
+%ifarch x86_64 aarch64 riscv64
+%bcond_with bundled_llvm
+%else
 %bcond_without bundled_llvm
+%endif
 %bcond_without bundled_libgit2
 %bcond_with disabled_libssh2
 %bcond_without lldb
@@ -21,8 +25,8 @@
 %endif
 
 Name:                rust
-Version:             1.82.0
-Release:             7
+Version:             1.85.1
+Release:             1
 Summary:             The Rust Programming Language
 License:             Apache-2.0 OR MIT
 URL:                 https://www.rust-lang.org
@@ -34,15 +38,12 @@ Source3:             cargo-config
 Source4:             cargo-config.sh
 Source5:             cargo-config.csh
 
-Patch0000:           rustc-1.82.0-disable-libssh2.patch
+Patch0000:           rustc-1.85.0-disable-libssh2.patch
 # By default, rust tries to use "rust-lld" as a linker for some targets.
 Patch0001:           0001-Use-lld-provided-by-system.patch
 # Set a substitute-path in rust-gdb for standard library sources.
 Patch0002:           rustc-1.70.0-rust-gdb-substitute-path.patch
 Patch0003:           0001-add-support-for-ppc64le.patch
-# https://github.com/rust-lang/rust/pull/130034 (from 1.83)
-Patch0004:           0001-Fix-enabling-wasm-component-ld-to-match-other-tools.patch
-Patch0005:	     0001-fix-build-error-for-loongarch64.patch
 
 %{lua: function rust_triple(arch)
   local abi = "gnu"
@@ -112,16 +113,23 @@ BuildRequires:       pkgconfig(openssl) pkgconfig(zlib) pkgconfig(libssh2) >= 1.
 %global python python3
 BuildRequires:       %{python}
 %if %with bundled_llvm
-BuildRequires:       cmake3 >= 3.13.4
-Provides:            bundled(llvm) = 19.1.1
+BuildRequires:       cmake3 >= 3.20.0
+Provides:            bundled(llvm) = 19.1.7
 %else
-BuildRequires:       cmake >= 2.8.11
+BuildRequires:       cmake >= 3.5.1
 %if %defined llvm
 %global llvm_root %{_libdir}/%{llvm}
 %else
 # default llvm is decent enough on riscv64
+%ifarch x86_64 aarch64 riscv64
+%global llvm llvm-toolset-18-llvm
+%global llvm_root /opt/openEuler/llvm-toolset-18/root%{_prefix}
+%global clang_maj_ver 18
+%else
 %global llvm llvm
 %global llvm_root %{_prefix}
+%global clang_maj_ver 17
+%endif
 %endif
 # Minimum external LLVM for rust 1.82
 BuildRequires:       %{llvm} >= 17.0.0
@@ -132,8 +140,13 @@ BuildRequires:       %{llvm}-static libffi-devel
 %endif
 BuildRequires:       procps-ng
 BuildRequires:       ninja-build
+%ifarch x86_64 aarch64 riscv64
+BuildRequires:       llvm-toolset-18-compiler-rt
+BuildRequires:       llvm-toolset-18-clang
+%else
 BuildRequires:       compiler-rt
 BuildRequires:       clang
+%endif
 Provides:            rustc = %{version}-%{release}
 Provides:            rustc%{?_isa} = %{version}-%{release}
 Requires:            %{name}-std-static%{?_isa} = %{version}-%{release}
@@ -197,7 +210,7 @@ Summary:             Rust's package manager and build tool
 Provides:            bundled(libgit2) = 1.1.0
 %endif
 BuildRequires:       git
-Requires:            rust
+Requires:            %{name} = %{version}-%{release}
 Obsoletes:           cargo-vendor <= 0.1.23
 Provides:            cargo-vendor = %{version}-%{release}
 %description -n cargo
@@ -280,8 +293,6 @@ sed -i.try-python -e '/^try python3 /i try "%{python}" "$@"' ./configure
 %patch -P 0001 -p1
 %patch -P 0002 -p1
 %patch -P 0003 -p1
-%patch -P 0004 -p1
-%patch -P 0005 -p1
 rm -rf vendor/curl-sys*/curl/
 rm -rf vendor/jemalloc-sys/jemalloc/
 rm -rf vendor/libffi-sys*/libffi/
@@ -345,10 +356,9 @@ fi
 %ifarch ppc64le
 %global _arch powerpc64le
 %endif
-%global clang_maj_ver 17
 %if %{?clang_maj_ver} >= 17
 # This is the new one, used on openEuler 24.03 LTS or later
-%define profiler %(echo %{_prefix}/%{_lib}/clang/%{clang_maj_ver}/lib/%{_arch}-%{_vendor}-linux-gnu/libclang_rt.profile.a)
+%define profiler %(echo %{llvm_root}/%{_lib}/clang/%{clang_maj_ver}/lib/%{_arch}-%{_vendor}-linux-gnu/libclang_rt.profile.a)
 %else
 # This is used before openEuler 23.09
 %global clang_full_ver %%(clang --version | awk '/clang version/{print $3}')
@@ -477,6 +487,7 @@ export %{rust_env}
 %dir %{rustlibdir}/%{rust_triple}
 %dir %{rustlibdir}/%{rust_triple}/lib
 %{rustlibdir}/%{rust_triple}/lib/*.rlib
+%{rustlibdir}/%{rust_triple}/bin/rust-objcopy
 %if %{with musl_target}
 %dir %{rustlibdir}/%{rust_musl_triple}
 %dir %{rustlibdir}/%{rust_musl_triple}/lib
@@ -549,6 +560,21 @@ export %{rust_env}
 %{_mandir}/man1/cargo*.1*
 
 %changelog
+* Tue Apr 01 2025 wangkai <13474090681@163.com> - 1.85.1-1
+- Update to 1.85.1
+
+* Fri Mar 07 2025 jchzhou <zhoujiacheng@iscas.ac.cn> - 1.85.0-1
+- Update to 1.85.0
+
+* Wed Feb 26 2025 laokz <zhangkai@iscas.ac.cn> - 1.82.0-10
+- Switch to unbundled llvm for riscv64 building
+
+* Wed Jan 15 2025 wangkai <13474090681@163.com> - 1.82.0-9
+- Switch to unbundled llvm for x86_64 aarch64 building
+
+* Fri Jan 03 2025 laokz <zhangkai@iscas.ac.cn> - 1.82.0-8
+- fix the error out of memory for riscv64
+
 * Fri Dec 20 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 1.82.0-7
 - fix the error out of memory for loongarch64
 
diff --git a/rustc-1.82.0-src.tar.xz.asc b/rustc-1.82.0-src.tar.xz.asc
deleted file mode 100644
index 3c1b0124fd01d7d3b074f3cf882dbb0fd38021f5..0000000000000000000000000000000000000000
--- a/rustc-1.82.0-src.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-wsFcBAABCgAQBQJnETfJCRCFq5bm+hvl/gAASrIP/R3fPIF8QTLm3MxtYYYESIUz
-BbTUeC3NCuasXFLY7lPPazlgMTvtuRxn4qpTliwtGKtCDWtr1LdzwzFCw2zrW72g
-wA/HHvpq16z3Qkk6kjW27c+QQVatAmBtpydehHo3V4QeMs1piMEbGT7cnyN/cW+u
-o4YoBdfRMDKV13n516QhBDI7+LzF/Tz1P7RYYnXhSFQ4DwZZBdZni5udaELI8I2R
-bhFwe0AC/msClq+Wo5u8I5qfmzUf4hj+zVCUeWt8srk434DkgEX+5lz4jkQH1WLv
-HMZXyfx0xwynOe00teZKy6X8lD9KgF0EgbKEjntPbXlGiLWSRpFFvkPpz6DNQ0Hy
-QiVqebi7skwO+SK/Go45SAnIH4y/nlMMx0RAtivDtk53VNU68wju5dXJ5KiWCWyc
-vWZROmT5SdYFtaEGtiQyS4vhXKZ0mbTDX0LjxogLf+eW4wyRk91zzUxkpZ69SuSG
-cR6AblMjvcjCfwgbSNkA4zg5V3OKs4WmuEyeO4Q/EMCO6+USjzwjqOB5L1NSFUkL
-8z0qC70x68PR7d7mXgnqui4zISrYeXYe9nVRkwNwNFWFWBNUtW/LUGD/v6ee9CWD
-0cYmInsUFM8DxtqJH0rsfd78qjrQwEtoReTrwO1fs9E5L3kCqZm5tNxp6A2vgCr/
-PIc5UHGVeUxQWc1bYNha
-=IXFx
------END PGP SIGNATURE-----
diff --git a/rustc-1.82.0-disable-libssh2.patch b/rustc-1.85.0-disable-libssh2.patch
similarity index 64%
rename from rustc-1.82.0-disable-libssh2.patch
rename to rustc-1.85.0-disable-libssh2.patch
index 69f5704e872868b342f3baaa206b56cb471ae554..09be94551e51eee0d6378ca9d4b45eaa300cf2ab 100644
--- a/rustc-1.82.0-disable-libssh2.patch
+++ b/rustc-1.85.0-disable-libssh2.patch
@@ -1,7 +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	2024-09-06 10:36:55.743405666 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2024-09-06 10:36:55.745405652 -0700
-@@ -2156,7 +2156,6 @@ checksum = "10472326a8a6477c3c20a64547b0
+--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2025-01-17 14:26:49.845587361 -0800
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2025-01-17 14:26:49.848587324 -0800
+@@ -2296,7 +2296,6 @@ checksum = "10472326a8a6477c3c20a64547b0
  dependencies = [
   "cc",
   "libc",
@@ -9,7 +9,7 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools
   "libz-sys",
   "openssl-sys",
   "pkg-config",
-@@ -2197,20 +2196,6 @@ dependencies = [
+@@ -2337,20 +2336,6 @@ dependencies = [
   "pkg-config",
   "vcpkg",
  ]
@@ -31,14 +31,14 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools
  [[package]]
  name = "libz-sys"
 diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2024-09-06 10:36:55.746405645 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2024-09-06 10:37:13.849280464 -0700
-@@ -44,7 +44,7 @@ curl = "0.4.46"
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2025-01-17 14:26:49.848587324 -0800
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2025-01-17 14:27:49.035844397 -0800
+@@ -47,7 +47,7 @@ curl = "0.4.46"
  curl-sys = "0.4.73"
  filetime = "0.2.23"
  flate2 = { version = "1.0.30", default-features = false, features = ["zlib"] }
 -git2 = "0.19.0"
 +git2 = { version = "0.19.0", default-features = false, features = ["https"] }
  git2-curl = "0.20.0"
- gix = { version = "0.64.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] }
+ gix = { version = "0.69.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] }
  glob = "0.3.1"
diff --git a/rustc-1.85.1-src.tar.xz b/rustc-1.85.1-src.tar.xz
new file mode 100644
index 0000000000000000000000000000000000000000..081a8f14aa891d306e16b2fe3c30d3051f6b264c
--- /dev/null
+++ b/rustc-1.85.1-src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b1fbf809efe9f036939401e142631c201a53bcf43ec1696bd9f5290ba236a266
+size 274028992
diff --git a/rustc-1.85.1-src.tar.xz.asc b/rustc-1.85.1-src.tar.xz.asc
new file mode 100644
index 0000000000000000000000000000000000000000..baa47684a2ca48c479f45ff1457dad8e2ab7bab6
--- /dev/null
+++ b/rustc-1.85.1-src.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+wsFcBAABCgAQBQJn2armCRCFq5bm+hvl/gAAitUP/2+xphd62tVBLMvuhCn7ceW0
+aO/vtsDMsYieEIC1CyRNzfVUh3W7Sr978XLuZ84K5I0CmvCW4xI2x3XA29VxTGLl
+cryqYSf7bshtjvRumzQRZ/2vuK+e9UhY0FH9Dwqb+o9/pivKN1m91PY9OFNoSL64
+s0W/vDmvGL2h5qTQ//EYq28sEmOiajXRcU5xsb1RJq0Xrlf6VmZrinNi37M3Qz/4
+AI77CXCXKVmtbhFXOcVbrN5V/RHmW/IB/G3WXL9482csLb5E0zSmrfXrtCSZk6OU
+QXwNYe/eFyTEuVNSlJuWFnt24y0SjZx83jPasau3ima4cQP+z2azk2wzcOK/YPzG
+95ZPYAzuVW/eSCa6q62SwDc6HYUC5HgyYzpK+HWvs6/BPqcRD19BtlrjtkcAr7ku
+555tnSG5MlJr6r2A16xhIRJ/yMh5SstD9XzCXDt+Fq1RsYybIABbeaJ2ZnSxjaa8
+0PmkhKjgQ7SGWf/K0t7btfpbFvblls/9WVwguOcVZfYfi8u6j/ynSerkyznP394G
+AYhh0Re4GoUa3SLlyLmWH/2dMOSn8J69G7E/IfpX+uVaUAofoQIjoxdO6l69l5jX
+dbZk0sD1rD4zQRdiZVU3a9r/PcOuqbq+9ImSLL+Bhivn8paFWDtFuz9gXlHlsoLP
+xgnKls+YzGWbvE0U2xvf
+=714L
+-----END PGP SIGNATURE-----