Merge remote-tracking branch 'origin/main' into rootjalex/ptx-lut-fix

Author: abadams

src/CodeGen_Internal.cpp

@@ -672,9 +672,9 @@ std::unique_ptr<llvm::TargetMachine> make_target_machine(const llvm::Module &mod
 
     auto *tm = llvm_target->createTargetMachine(
 #if LLVM_VERSION >= 210
-        module.getTargetTriple().str(),
+        triple,
 #else
-        module.getTargetTriple(),
+        triple.str(),
 #endif
         mcpu_target,
         mattrs,

src/CodeGen_PTX_Dev.cpp

@@ -615,11 +615,16 @@ vector<char> CodeGen_PTX_Dev::compile_to_src() {
     options.GuaranteedTailCallOpt = false;
 
     std::unique_ptr<TargetMachine>
-        target_machine(llvm_target->createTargetMachine(triple.str(),
-                                                        mcpu_target(), mattrs(), options,
-                                                        llvm::Reloc::PIC_,
-                                                        llvm::CodeModel::Small,
-                                                        CodeGenOptLevel::Aggressive));
+        target_machine(llvm_target->createTargetMachine(
+#if LLVM_VERSION >= 210
+            triple,
+#else
+            triple.str(),
+#endif
+            mcpu_target(), mattrs(), options,
+            llvm::Reloc::PIC_,
+            llvm::CodeModel::Small,
+            CodeGenOptLevel::Aggressive));
 
     internal_assert(target_machine.get()) << "Could not allocate target machine!";