[Lldb-commits] [lldb] r215170 - Revert "Fix the build broken as a result of deleting jit from LLVM."

[Zachary Turner]

Author: zturner
Date: Thu Aug  7 18:26:01 2014
New Revision: 215170

URL: http://llvm.org/viewvc/llvm-project?rev=215170&view=rev
Log:
Revert "Fix the build broken as a result of deleting jit from LLVM."

jit was re-added back to LLVM, so now we require to link against it
again.  Should it get removed again, then revert this revert.

Modified:
    lldb/trunk/lib/Makefile
    lldb/trunk/source/CMakeLists.txt
    lldb/trunk/source/Expression/IRExecutionUnit.cpp

Modified: lldb/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lib/Makefile?rev=215170&r1=215169&r2=215170&view=diff
==============================================================================
--- lldb/trunk/lib/Makefile (original)
+++ lldb/trunk/lib/Makefile Thu Aug  7 18:26:01 2014
@@ -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)

Modified: lldb/trunk/source/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/CMakeLists.txt?rev=215170&r1=215169&r2=215170&view=diff
==============================================================================
--- lldb/trunk/source/CMakeLists.txt (original)
+++ lldb/trunk/source/CMakeLists.txt Thu Aug  7 18:26:01 2014
@@ -181,6 +181,7 @@ list(APPEND LLDB_SYSTEM_LIBS ${system_li
 
 set( LLVM_LINK_COMPONENTS
   ${LLVM_TARGETS_TO_BUILD}
+  jit
   interpreter
   asmparser
   bitreader

Modified: lldb/trunk/source/Expression/IRExecutionUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/IRExecutionUnit.cpp?rev=215170&r1=215169&r2=215170&view=diff
==============================================================================
--- lldb/trunk/source/Expression/IRExecutionUnit.cpp (original)
+++ lldb/trunk/source/Expression/IRExecutionUnit.cpp Thu Aug  7 18:26:01 2014
@@ -302,7 +302,9 @@ IRExecutionUnit::GetRunnableInfo(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;