switch to using llvm/Target/TargetSelect.h
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@73611 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp
index 618692d..afd3c5a 100644
--- a/tools/lli/lli.cpp
+++ b/tools/lli/lli.cpp
@@ -28,7 +28,7 @@
#include "llvm/Support/PrettyStackTrace.h"
#include "llvm/System/Process.h"
#include "llvm/System/Signals.h"
-#include "llvm/Config/config.h"
+#include "llvm/Target/TargetSelect.h"
#include <iostream>
#include <cerrno>
using namespace llvm;
@@ -85,16 +85,6 @@
llvm_shutdown();
}
-#ifdef LLVM_NATIVE_ARCH
-namespace llvm {
-#define Declare2(TARG, MOD) void Initialize ## TARG ## MOD()
-#define Declare(T, M) Declare2(T, M)
- Declare(LLVM_NATIVE_ARCH, Target);
-#undef Declare
-#undef Declare2
-}
-#endif
-
//===----------------------------------------------------------------------===//
// main Driver function
//
@@ -149,15 +139,9 @@
case '3': OLvl = CodeGenOpt::Aggressive; break;
}
- // If we have a native target, initialize it to ensure it is linked in.
-#ifdef LLVM_NATIVE_ARCH
-#define DoInit2(TARG, MOD) llvm::Initialize ## TARG ## MOD()
-#define DoInit(T, M) DoInit2(T, M)
- DoInit(LLVM_NATIVE_ARCH, Target);
-#undef DoInit
-#undef DoInit2
-#endif
-
+ // If we have a native target, initialize it to ensure it is linked in and
+ // usable by the JIT.
+ InitializeNativeTarget();
EE = ExecutionEngine::create(MP, ForceInterpreter, &ErrorMsg, OLvl);
if (!EE && !ErrorMsg.empty()) {