Interpreter, JIT moved to lib/ExecutionEngine (includes -> llvm/ExecutionEngine)

Build lli using executionengine library

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8372 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/lli/Makefile b/tools/lli/Makefile
index 666a1f69b54b85d91612645e8d7298b19c8096df..1c64b6933d82896ca8b7e67cd0a52a662bd8bf91 100644 (file)
--- a/tools/lli/Makefile
+++ b/tools/lli/Makefile
@@ -1,12 +1,11 @@
 LEVEL = ../..
 TOOLNAME = lli
-PARALLEL_DIRS = Interpreter JIT
 
 # Get the $(ARCH) setting
 include $(LEVEL)/Makefile.config
 
 # Generic JIT libraries
-JITLIBS   = lli-jit codegen
+JITLIBS   = lli-jit codegen executionengine
 ARCHLIBS  =
 
 # You can enable the X86 JIT on a non-X86 host by setting the flag

diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp
index 125f075856768d715a0751bc9f121086731290df..ebe618a90eba2f898e1e717eb7813ea37b503f75 100644 (file)
--- a/tools/lli/lli.cpp
+++ b/tools/lli/lli.cpp
@@ -9,10 +9,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "ExecutionEngine.h"
-#include "GenericValue.h"
 #include "Support/CommandLine.h"
 #include "Support/Debug.h"
+#include "llvm/ExecutionEngine/ExecutionEngine.h"
+#include "llvm/ExecutionEngine/GenericValue.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Module.h"
 #include "llvm/Target/TargetMachineImpls.h"