Rollup merge of rust-lang#138137 - ZequanWu:fix-triple, r=cuviper

compiler-errors · web-flow · commit 3dafc372bd56 · 2025-03-07T15:39:10.000-05:00
setTargetTriple now accepts Triple rather than string llvm/llvm-project#129868 updated `setTargetTriple`
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
@@ -152,8 +152,12 @@ extern "C" LLVMContextRef LLVMRustContextCreate(bool shouldDiscardNames) {
 }
 
 extern "C" void LLVMRustSetNormalizedTarget(LLVMModuleRef M,
-                                            const char *Triple) {
-  unwrap(M)->setTargetTriple(Triple::normalize(Triple));
+                                            const char *Target) {
+#if LLVM_VERSION_GE(21, 0)
+  unwrap(M)->setTargetTriple(Triple(Triple::normalize(Target)));
+#else
+  unwrap(M)->setTargetTriple(Triple::normalize(Target));
+#endif
 }
 
 extern "C" void LLVMRustPrintPassTimings(RustStringRef OutBuf) {

Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,12 @@ extern "C" LLVMContextRef LLVMRustContextCreate(bool shouldDiscardNames) {`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`extern "C" void LLVMRustSetNormalizedTarget(LLVMModuleRef M,`
`155`		`- const char *Triple) {`
`156`		`- unwrap(M)->setTargetTriple(Triple::normalize(Triple));`
	`155`	`+ const char *Target) {`
	`156`	`+#if LLVM_VERSION_GE(21, 0)`
	`157`	`+ unwrap(M)->setTargetTriple(Triple(Triple::normalize(Target)));`
	`158`	`+#else`
	`159`	`+ unwrap(M)->setTargetTriple(Triple::normalize(Target));`
	`160`	`+#endif`
`157`	`161`	`}`
`158`	`162`
`159`	`163`	`extern "C" void LLVMRustPrintPassTimings(RustStringRef OutBuf) {`