Auto merge of rust-lang#121395 - nikic:update-llvm-21, r=<try>

Update to LLVM 18.1.0 rc 3

Fixes rust-lang#120819.
Fixes rust-lang#121180.
Fixes rust-lang#121239.
Fixes rust-lang#121367.

.gitmodules

@@ -32,8 +32,8 @@
 	shallow = true
 [submodule "src/llvm-project"]
 	path = src/llvm-project
-	url = https://github.com/rust-lang/llvm-project.git
-	branch = rustc/18.0-2024-02-13
+	url = https://github.com/nikic/llvm-project.git
+	branch = rust-shlib-cherry-pick
 	shallow = true
 [submodule "src/doc/embedded-book"]
 	path = src/doc/embedded-book

src/bootstrap/src/core/build_steps/dist.rs

@@ -2026,7 +2026,16 @@ fn install_llvm_file(builder: &Builder<'_>, source: &Path, destination: &Path) {
         return;
     }
 
-    builder.install(source, destination, 0o644);
+    if source.is_symlink() {
+        // If we have a symlink like libLLVM-18.so -> libLLVM.so.18.1, install both the target
+        // and the symlink. The target is what will get loaded at runtime. The symlink is what
+        // will be used for linking when download-ci-llvm is used.
+        builder.install(&t!(fs::canonicalize(source)), destination, 0o644);
+        let full_dest = destination.join(source.file_name().unwrap());
+        builder.copy(&source, &full_dest);
+    } else {
+        builder.install(&source, destination, 0o644);
+    }
 }
 
 /// Maybe add LLVM object files to the given destination lib-dir. Allows either static or dynamic linking.

src/bootstrap/src/core/build_steps/llvm.rs

@@ -98,9 +98,6 @@ pub fn prebuilt_llvm_config(
     let out_dir = builder.llvm_out(target);
 
     let mut llvm_config_ret_dir = builder.llvm_out(builder.config.build);
-    if (!builder.config.build.is_msvc() || builder.ninja()) && !builder.config.llvm_from_ci {
-        llvm_config_ret_dir.push("build");
-    }
     llvm_config_ret_dir.push("bin");
     let build_llvm_config = llvm_config_ret_dir.join(exe("llvm-config", builder.config.build));
     let llvm_cmake_dir = out_dir.join("lib/cmake/llvm");

src/tools/opt-dist/src/main.rs

@@ -270,7 +270,8 @@ fn execute_pipeline(
             })?;
 
             let libdir = env.build_artifacts().join("stage2").join("lib");
-            let llvm_lib = io::find_file_in_dir(&libdir, "libLLVM", ".so")?;
+            // The actual name will be something like libLLVM.so.18.1-rust-dev.
+            let llvm_lib = io::find_file_in_dir(&libdir, "libLLVM.so", "")?;
 
             log::info!("Optimizing {llvm_lib} with BOLT");