summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lldb/lib/Makefile2
-rw-r--r--lldb/source/CMakeLists.txt1
-rw-r--r--lldb/source/Expression/IRExecutionUnit.cpp4
3 files changed, 5 insertions, 2 deletions
diff --git a/lldb/lib/Makefile b/lldb/lib/Makefile
index ee427d9f2f3..dcfdb3b300a 100644
--- a/lldb/lib/Makefile
+++ b/lldb/lib/Makefile
@@ -92,7 +92,7 @@ endif
include $(LLDB_LEVEL)/../../Makefile.config
LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter codegen \
- instrumentation ipo irreader selectiondag mc mcjit \
+ instrumentation ipo irreader selectiondag jit mc mcjit \
linker option
ifeq ($(HOST_OS),Darwin)
diff --git a/lldb/source/CMakeLists.txt b/lldb/source/CMakeLists.txt
index 517f4eb64de..46998af8b93 100644
--- a/lldb/source/CMakeLists.txt
+++ b/lldb/source/CMakeLists.txt
@@ -181,6 +181,7 @@ list(APPEND LLDB_SYSTEM_LIBS ${system_libs})
set( LLVM_LINK_COMPONENTS
${LLVM_TARGETS_TO_BUILD}
+ jit
interpreter
asmparser
bitreader
diff --git a/lldb/source/Expression/IRExecutionUnit.cpp b/lldb/source/Expression/IRExecutionUnit.cpp
index fb8ea1a3587..76956082da0 100644
--- a/lldb/source/Expression/IRExecutionUnit.cpp
+++ b/lldb/source/Expression/IRExecutionUnit.cpp
@@ -302,7 +302,9 @@ IRExecutionUnit::GetRunnableInfo(Error &error,
.setRelocationModel(relocModel)
.setJITMemoryManager(new MemoryManager(*this))
.setOptLevel(llvm::CodeGenOpt::Less)
- .setCodeModel(codeModel);
+ .setAllocateGVsWithCode(true)
+ .setCodeModel(codeModel)
+ .setUseMCJIT(true);
llvm::StringRef mArch;
llvm::StringRef mCPU;
OpenPOWER on IntegriCloud