From a6cde36dc46ceda9e85e6ddc20dbd0ba37662648 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Sat, 18 May 2019 20:33:22 +0300 Subject: [PATCH] Link LLVMAsmParser library --- 3rdparty/llvm.cmake | 2 +- Utilities/JIT.cpp | 1 + rpcs3_llvm.props | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/3rdparty/llvm.cmake b/3rdparty/llvm.cmake index 847ca6eb2e..87bf254313 100644 --- a/3rdparty/llvm.cmake +++ b/3rdparty/llvm.cmake @@ -52,7 +52,7 @@ if(WITH_LLVM) endif() endif() - set(LLVM_LIBS LLVMMCJIT LLVMX86CodeGen) + set(LLVM_LIBS LLVMMCJIT LLVMX86CodeGen LLVMX86AsmParser) add_library(3rdparty_llvm INTERFACE) target_link_libraries(3rdparty_llvm INTERFACE ${LLVM_LIBS}) diff --git a/Utilities/JIT.cpp b/Utilities/JIT.cpp index 11e799ba1e..9cf80dbb0b 100644 --- a/Utilities/JIT.cpp +++ b/Utilities/JIT.cpp @@ -250,6 +250,7 @@ static void* const s_memory = []() -> void* { llvm::InitializeNativeTarget(); llvm::InitializeNativeTargetAsmPrinter(); + llvm::InitializeNativeTargetAsmParser(); LLVMLinkInMCJIT(); #ifdef MAP_32BIT diff --git a/rpcs3_llvm.props b/rpcs3_llvm.props index e5317f5008..7d2e11f69b 100644 --- a/rpcs3_llvm.props +++ b/rpcs3_llvm.props @@ -10,7 +10,7 @@ ..\llvm_build\Debug\lib ..\llvm_build\Release\lib - LLVMProfileData.lib;LLVMDebugInfoCodeView.lib;LLVMDebugInfoMSF.lib;LLVMInstrumentation.lib;LLVMMCJIT.lib;LLVMRuntimeDyld.lib;LLVMVectorize.lib;LLVMX86CodeGen.lib;LLVMGlobalISel.lib;LLVMX86Disassembler.lib;LLVMExecutionEngine.lib;LLVMAsmPrinter.lib;LLVMSelectionDAG.lib;LLVMCodeGen.lib;LLVMScalarOpts.lib;LLVMInstCombine.lib;LLVMTransformUtils.lib;LLVMAnalysis.lib;LLVMTarget.lib;LLVMX86Desc.lib;LLVMX86AsmPrinter.lib;LLVMObject.lib;LLVMMCParser.lib;LLVMBitReader.lib;LLVMCore.lib;LLVMX86Utils.lib;LLVMMC.lib;LLVMX86Info.lib;LLVMSupport.lib;LLVMMCDisassembler.lib;LLVMipo.lib;LLVMBinaryFormat.lib;LLVMPasses.lib;LLVMIRReader.lib;LLVMLinker.lib;LLVMAsmParser.lib;LLVMDemangle.lib;LLVMDebugInfoDWARF.lib + LLVMProfileData.lib;LLVMDebugInfoCodeView.lib;LLVMDebugInfoMSF.lib;LLVMInstrumentation.lib;LLVMMCJIT.lib;LLVMRuntimeDyld.lib;LLVMVectorize.lib;LLVMX86CodeGen.lib;LLVMGlobalISel.lib;LLVMX86Disassembler.lib;LLVMExecutionEngine.lib;LLVMAsmPrinter.lib;LLVMSelectionDAG.lib;LLVMCodeGen.lib;LLVMScalarOpts.lib;LLVMInstCombine.lib;LLVMTransformUtils.lib;LLVMAnalysis.lib;LLVMTarget.lib;LLVMX86Desc.lib;LLVMX86AsmPrinter.lib;LLVMObject.lib;LLVMMCParser.lib;LLVMBitReader.lib;LLVMCore.lib;LLVMX86Utils.lib;LLVMMC.lib;LLVMX86Info.lib;LLVMSupport.lib;LLVMMCDisassembler.lib;LLVMipo.lib;LLVMBinaryFormat.lib;LLVMPasses.lib;LLVMIRReader.lib;LLVMLinker.lib;LLVMAsmParser.lib;LLVMX86AsmParser.lib;LLVMDemangle.lib;LLVMDebugInfoDWARF.lib;LLVMRemarks.lib