diff --git a/Utilities/JITLLVM.cpp b/Utilities/JITLLVM.cpp index 8f08e5c2d7..166ee7cec2 100644 --- a/Utilities/JITLLVM.cpp +++ b/Utilities/JITLLVM.cpp @@ -658,7 +658,7 @@ jit_compiler::jit_compiler(const std::unordered_map& _link, co std::string result; auto null_mod = std::make_unique ("null_", *m_context); -#if LLVM_VERSION_MAJOR > 20 +#if LLVM_VERSION_MAJOR >= 21 && (LLVM_VERSION_MINOR >= 1 || LLVM_VERSION_MAJOR >= 22) null_mod->setTargetTriple(llvm::Triple(jit_compiler::triple1())); #else null_mod->setTargetTriple(jit_compiler::triple1()); @@ -676,7 +676,7 @@ jit_compiler::jit_compiler(const std::unordered_map& _link, co else { mem = std::make_unique(std::move(symbols_cement)); -#if LLVM_VERSION_MAJOR > 20 +#if LLVM_VERSION_MAJOR >= 21 && (LLVM_VERSION_MINOR >= 1 || LLVM_VERSION_MAJOR >= 22) null_mod->setTargetTriple(llvm::Triple(jit_compiler::triple2())); #else null_mod->setTargetTriple(jit_compiler::triple2()); diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index 64a989a9bf..456715ccf9 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -5803,11 +5803,11 @@ static void ppu_initialize2(jit_compiler& jit, const ppu_module& module std::unique_ptr _module = std::make_unique(obj_name, jit.get_context()); // Initialize target -#if LLVM_VERSION_MAJOR > 20 +#if LLVM_VERSION_MAJOR >= 21 && (LLVM_VERSION_MINOR >= 1 || LLVM_VERSION_MAJOR >= 22) _module->setTargetTriple(Triple(jit_compiler::triple1())); #else _module->setTargetTriple(jit_compiler::triple1()); -#endif +#endif _module->setDataLayout(jit.get_engine().getTargetMachine()->createDataLayout()); // Initialize translator diff --git a/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp b/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp index 91ed1d43ef..fa1d782ee4 100644 --- a/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp +++ b/rpcs3/Emu/Cell/SPULLVMRecompiler.cpp @@ -1598,7 +1598,7 @@ public: // Create LLVM module std::unique_ptr _module = std::make_unique(m_hash + ".obj", m_context); -#if LLVM_VERSION_MAJOR > 20 +#if LLVM_VERSION_MAJOR >= 21 && (LLVM_VERSION_MINOR >= 1 || LLVM_VERSION_MAJOR >= 22) _module->setTargetTriple(Triple(jit_compiler::triple2())); #else _module->setTargetTriple(jit_compiler::triple2()); @@ -2877,7 +2877,7 @@ public: // Create LLVM module std::unique_ptr _module = std::make_unique("spu_interpreter.obj", m_context); -#if LLVM_VERSION_MAJOR > 20 +#if LLVM_VERSION_MAJOR >= 21 && (LLVM_VERSION_MINOR >= 1 || LLVM_VERSION_MAJOR >= 22) _module->setTargetTriple(Triple(jit_compiler::triple2())); #else _module->setTargetTriple(jit_compiler::triple2());