3 files changed, 12 insertions, 25 deletions
diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp
index 34976877fe..e71b378323 100644
--- a/tools/llc/llc.cpp
+++ b/tools/llc/llc.cpp
@@ -38,8 +38,7 @@
 #include "llvm/System/Signals.h"
 #include "llvm/Config/config.h"
 #include "llvm/LinkAllVMCore.h"
-#include "llvm/InitializeAllTargets.h"
-#include "llvm/InitializeAllAsmPrinters.h"
+#include "llvm/Target/TargetSelect.h"
 #include <fstream>
 #include <iostream>
 #include <memory>
@@ -216,6 +215,9 @@ int main(int argc, char **argv) {
   llvm_shutdown_obj Y;  // Call llvm_shutdown() on exit.
   cl::ParseCommandLineOptions(argc, argv, "llvm system compiler\n");
 
+  InitializeAllTargets();
+  InitializeAllAsmPrinters();
+  
   // Load the module to be compiled...
   std::string ErrorMessage;
   std::auto_ptr<Module> M;
diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp
index 618692db70..afd3c5a71f 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 @@ static void do_shutdown() {
   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 @@ int main(int argc, char **argv, char * const *envp) {
   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()) {
diff --git a/tools/lto/LTOCodeGenerator.cpp b/tools/lto/LTOCodeGenerator.cpp
index ed23b9e9ea..11e0e55517 100644
--- a/tools/lto/LTOCodeGenerator.cpp
+++ b/tools/lto/LTOCodeGenerator.cpp
@@ -18,8 +18,6 @@
 
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
-#include "llvm/InitializeAllTargets.h"
-#include "llvm/InitializeAllAsmPrinters.h"
 #include "llvm/Linker.h"
 #include "llvm/Module.h"
 #include "llvm/ModuleProvider.h"
@@ -39,10 +37,11 @@
 #include "llvm/System/Signals.h"
 #include "llvm/Target/SubtargetFeature.h"
 #include "llvm/Target/TargetOptions.h"
+#include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetMachineRegistry.h"
-#include "llvm/Target/TargetAsmInfo.h"
+#include "llvm/Target/TargetSelect.h"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Config/config.h"
@@ -76,6 +75,8 @@ LTOCodeGenerator::LTOCodeGenerator()
       _codeModel(LTO_CODEGEN_PIC_MODEL_DYNAMIC),
       _nativeObjectFile(NULL), _gccPath(NULL), _assemblerPath(NULL)
 {
+  InitializeAllTargets();
+  InitializeAllAsmPrinters();
 
 }