about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
-rw-r--r--lib/Core/ExternalDispatcher.cpp5
-rw-r--r--tools/klee/Makefile2
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/Core/ExternalDispatcher.cpp b/lib/Core/ExternalDispatcher.cpp
index eb60dcff..3486a757 100644
--- a/lib/Core/ExternalDispatcher.cpp
+++ b/lib/Core/ExternalDispatcher.cpp
@@ -20,6 +20,7 @@
 #include "llvm/System/DynamicLibrary.h"
 #include "llvm/Support/Streams.h"
 #include "llvm/Support/raw_ostream.h"
+#include "llvm/Target/TargetSelect.h"
 #include <setjmp.h>
 #include <signal.h>
 
@@ -76,6 +77,10 @@ ExternalDispatcher::ExternalDispatcher() {
     abort();
   }
 
+  // If we have a native target, initialize it to ensure it is linked in and
+  // usable by the JIT.
+  llvm::InitializeNativeTarget();
+
   // from ExecutionEngine::create
   if (executionEngine) {
     // Make sure we can resolve symbols in the program as well. The zero arg
diff --git a/tools/klee/Makefile b/tools/klee/Makefile
index b556175d..fbdcfd85 100644
--- a/tools/klee/Makefile
+++ b/tools/klee/Makefile
@@ -10,7 +10,7 @@
 LEVEL=../..
 TOOLNAME = klee
 USEDLIBS = kleeCore.a kleeModule.a kleaverSolver.a kleaverExpr.a kleeSupport.a kleeBasic.a
-LINK_COMPONENTS = bitreader bitwriter ipo linker engine
+LINK_COMPONENTS = jit bitreader bitwriter ipo linker engine
 
 include $(LEVEL)/Makefile.common