[llvm-commits] [llvm] r73611 - in /llvm/trunk/tools: llc/llc.cpp lli/lli.cpp lto/LTOCodeGenerator.cpp
Chris Lattner
sabre at nondot.org
Wed Jun 17 09:42:19 PDT 2009
Author: lattner
Date: Wed Jun 17 11:42:19 2009
New Revision: 73611
URL: http://llvm.org/viewvc/llvm-project?rev=73611&view=rev
Log:
switch to using llvm/Target/TargetSelect.h
Modified:
llvm/trunk/tools/llc/llc.cpp
llvm/trunk/tools/lli/lli.cpp
llvm/trunk/tools/lto/LTOCodeGenerator.cpp
Modified: llvm/trunk/tools/llc/llc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llc/llc.cpp?rev=73611&r1=73610&r2=73611&view=diff
==============================================================================
--- llvm/trunk/tools/llc/llc.cpp (original)
+++ llvm/trunk/tools/llc/llc.cpp Wed Jun 17 11:42:19 2009
@@ -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 @@
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;
Modified: llvm/trunk/tools/lli/lli.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/lli.cpp?rev=73611&r1=73610&r2=73611&view=diff
==============================================================================
--- llvm/trunk/tools/lli/lli.cpp (original)
+++ llvm/trunk/tools/lli/lli.cpp Wed Jun 17 11:42:19 2009
@@ -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()) {
Modified: llvm/trunk/tools/lto/LTOCodeGenerator.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/LTOCodeGenerator.cpp?rev=73611&r1=73610&r2=73611&view=diff
==============================================================================
--- llvm/trunk/tools/lto/LTOCodeGenerator.cpp (original)
+++ llvm/trunk/tools/lto/LTOCodeGenerator.cpp Wed Jun 17 11:42:19 2009
@@ -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 @@
_codeModel(LTO_CODEGEN_PIC_MODEL_DYNAMIC),
_nativeObjectFile(NULL), _gccPath(NULL), _assemblerPath(NULL)
{
+ InitializeAllTargets();
+ InitializeAllAsmPrinters();
}
More information about the llvm-commits
mailing list