Add missing target-abi to cross-lang llvm lto bitcode

compiler/rustc_codegen_llvm/src/context.rs

@@ -326,6 +326,16 @@ pub unsafe fn create_module<'ll>(
         llvm::LLVMMDNodeInContext(llcx, &name_metadata, 1),
     );
 
+    if sess.opts.cg.linker_plugin_lto.enabled() {
+        llvm::LLVMRustAddModuleStringFlag(
+            llmod,
+            llvm::LLVMModFlagBehavior::Override,
+            c"target-abi".as_ptr(),
+            sess.target.llvm_abiname.as_ptr().cast(),
+            sess.target.llvm_abiname.len(),
+        )
+    }
+
     // Add module flags specified via -Z llvm_module_flag
     for (key, value, behavior) in &sess.opts.unstable_opts.llvm_module_flag {
         let key = format!("{key}\0");

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

@@ -1807,6 +1807,15 @@ extern "C" {
         name: *const c_char,
         value: u32,
     );
+
+    pub fn LLVMRustAddModuleStringFlag(
+        M: &Module,
+        merge_behavior: LLVMModFlagBehavior,
+        name: *const c_char,
+        value: *const c_char,
+        valueLen: size_t,
+    );
+
     pub fn LLVMRustHasModuleFlag(M: &Module, name: *const c_char, len: size_t) -> bool;
 
     pub fn LLVMRustDIBuilderCreate(M: &Module) -> &mut DIBuilder<'_>;

compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp

@@ -825,6 +825,16 @@ extern "C" void LLVMRustAddModuleFlag(
   unwrap(M)->addModuleFlag(MergeBehavior, Name, Value);
 }
 
+extern "C" void LLVMRustAddModuleStringFlag(
+    LLVMModuleRef M,
+    Module::ModFlagBehavior MergeBehavior,
+    const char *Name,
+    const char *Value,
+    size_t ValueLen) {
+  unwrap(M)->addModuleFlag(MergeBehavior, Name,
+    MDString::get(unwrap(M)->getContext(), StringRef(Value, ValueLen)));
+}
+
 extern "C" bool LLVMRustHasModuleFlag(LLVMModuleRef M, const char *Name,
                                       size_t Len) {
   return unwrap(M)->getModuleFlag(StringRef(Name, Len)) != nullptr;