Update to Rust 1.86.0

Author: topjohnwu

common.sh

@@ -1,7 +1,7 @@
 # Copyright 2022-2025 Google LLC.
 # SPDX-License-Identifier: Apache-2.0
 
-RUST_VERSION='1.85.0'
+RUST_VERSION='1.86.0'
 
 NDK_VERSION='r29-beta1'
 NDK_DIR_VERSION=$NDK_VERSION
@@ -13,7 +13,7 @@ LLVM_SVN='547379'
 LLVM_ANDROID_VERSION='456a459bd653ddf1cca170e7e9aef9d122a81731'
 TOOLCHAIN_UTILS_VERSION='a1bb7f26cc6b735c3d685db12739bb03ad9a2993'
 
-OUTPUT_VERSION='r29.0'
+OUTPUT_VERSION='r29.1'
 
 PYTHON_CMD='python3'
 
@@ -63,8 +63,7 @@ git_clone_branch() {
 }
 
 skip_submodule() {
-  sed "s:.*submodule.*$1.*:&\n\tupdate = none:" .gitmodules > .gitmodules.p
-  mv .gitmodules.p .gitmodules
+  git config set -f .gitmodules "submodule.$1.update" none
 }
 
 clone_llvm() {
@@ -88,10 +87,9 @@ clone_rust() {
   cd src/rust
 
   # Skip unused submodules
-  skip_submodule llvm-project
-  skip_submodule enzyme
-  skip_submodule gcc
-  skip_submodule doc
+  skip_submodule src/llvm-project
+  skip_submodule src/gcc
+  skip_submodule src/tools/enzyme
 
   # Clone submodules
   git submodule update --init --depth=1

config.toml

@@ -1,4 +1,4 @@
-change-id = 134650
+change-id = 136941
 
 [llvm]
 targets = "AArch64;ARM;X86;RISCV"
@@ -19,8 +19,8 @@ tools = [
     "cargo",
     "src",
     "clippy",
-    "rust-analyzer",
     "rustfmt",
+    "rust-analyzer",
     "rust-analyzer-proc-macro-srv",
 ]
 cargo-native-static = true

patches/patch_llvm_build.patch

@@ -1,8 +1,8 @@
 diff --git a/src/bootstrap/src/core/build_steps/llvm.rs b/src/bootstrap/src/core/build_steps/llvm.rs
-index be5b4057..da2b5054 100644
+index 18da0e82..6c44509e 100644
 --- a/src/bootstrap/src/core/build_steps/llvm.rs
 +++ b/src/bootstrap/src/core/build_steps/llvm.rs
-@@ -308,7 +308,7 @@ fn run(self, builder: &Builder<'_>) -> LlvmResult {
+@@ -329,7 +329,7 @@ fn run(self, builder: &Builder<'_>) -> LlvmResult {
              LlvmBuildStatus::ShouldBuild(m) => m,
          };
 
@@ -11,7 +11,7 @@ index be5b4057..da2b5054 100644
              panic!("shared linking to LLVM is not currently supported on {}", target.triple);
          }
 
-@@ -463,6 +463,9 @@ fn run(self, builder: &Builder<'_>) -> LlvmResult {
+@@ -484,6 +484,9 @@ fn run(self, builder: &Builder<'_>) -> LlvmResult {
              enabled_llvm_projects.push("clang");
          }
 
@@ -21,7 +21,7 @@ index be5b4057..da2b5054 100644
          // We want libxml to be disabled.
          // See https://github.com/rust-lang/rust/pull/50104
          cfg.define("LLVM_ENABLE_LIBXML2", "OFF");
-@@ -567,7 +570,7 @@ fn run(self, builder: &Builder<'_>) -> LlvmResult {
+@@ -585,7 +588,7 @@ fn run(self, builder: &Builder<'_>) -> LlvmResult {
          // link to make llvm-config happy.
          if builder.llvm_link_shared() && target.contains("apple-darwin") {
              let lib_name = find_llvm_lib_name("dylib");

patches/support_ndk_llvm.patch

@@ -1,8 +1,8 @@
 diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs
-index 628c0b1c..f9cc304b 100644
+index b4b5d6a5..05f1d4b4 100644
 --- a/compiler/rustc_codegen_llvm/src/llvm_util.rs
 +++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs
-@@ -255,8 +255,8 @@ pub(crate) fn to_llvm_features<'a>(sess: &Session, s: &'a str) -> Option<LLVMFea
+@@ -258,8 +258,8 @@ pub(crate) fn to_llvm_features<'a>(sess: &Session, s: &'a str) -> Option<LLVMFea
          ("aarch64", "pacg") => Some(LLVMFeature::new("pauth")),
          ("aarch64", "pauth-lr") if get_version().0 < 19 => None,
          // Before LLVM 20 those two features were packaged together as b16b16
@@ -28,10 +28,10 @@ index f6598f9f..b2c78565 100644
 
  enum class LLVMRustResult { Success, Failure };
 diff --git a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
-index de14c6d1..78e04c1f 100644
+index a6b2384f..0bc639a4 100644
 --- a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
 +++ b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
-@@ -1620,7 +1620,7 @@ extern "C" void LLVMRustComputeLTOCacheKey(RustStringRef KeyOut,
+@@ -1632,7 +1632,7 @@ extern "C" void LLVMRustComputeLTOCacheKey(RustStringRef KeyOut,
    const auto &ExportList = Data->ExportLists.lookup(ModId);
    const auto &ResolvedODR = Data->ResolvedODR.lookup(ModId);
    const auto &DefinedGlobals = Data->ModuleToDefinedGVSummaries.lookup(ModId);
@@ -40,7 +40,7 @@ index de14c6d1..78e04c1f 100644
    DenseSet<GlobalValue::GUID> CfiFunctionDefs;
    DenseSet<GlobalValue::GUID> CfiFunctionDecls;
  #else
-@@ -1636,7 +1636,7 @@ extern "C" void LLVMRustComputeLTOCacheKey(RustStringRef KeyOut,
+@@ -1648,7 +1648,7 @@ extern "C" void LLVMRustComputeLTOCacheKey(RustStringRef KeyOut,
      CfiFunctionDecls.insert(
          GlobalValue::getGUID(GlobalValue::dropLLVMManglingEscape(Name)));