Put Target definitions inside Target specific header, and llvm namespace.

llvm-svn: 76344

4 files changed, 4 insertions, 3 deletions

diff --git a/llvm/lib/Target/IA64/AsmPrinter/IA64AsmPrinter.cpp b/llvm/lib/Target/IA64/AsmPrinter/IA64AsmPrinter.cpp
index 819191e4c5d..c224c8a32c2 100644
--- a/llvm/lib/Target/IA64/AsmPrinter/IA64AsmPrinter.cpp
+++ b/llvm/lib/Target/IA64/AsmPrinter/IA64AsmPrinter.cpp
@@ -377,6 +377,5 @@ FunctionPass *llvm::createIA64CodePrinterPass(formatted_raw_ostream &o,
 
 // Force static initialization.
 extern "C" void LLVMInitializeIA64AsmPrinter() { 
-  extern Target TheIA64Target;
   TargetRegistry::RegisterAsmPrinter(TheIA64Target, createIA64CodePrinterPass);
 }
diff --git a/llvm/lib/Target/IA64/IA64.h b/llvm/lib/Target/IA64/IA64.h
index e45aedaa731..2f986b3cfe2 100644
--- a/llvm/lib/Target/IA64/IA64.h
+++ b/llvm/lib/Target/IA64/IA64.h
@@ -41,6 +41,8 @@ FunctionPass *createIA64CodePrinterPass(formatted_raw_ostream &o,
                                         TargetMachine &tm,
                                         bool verbose);
 
+extern Target TheIA64Target;
+
 } // End llvm namespace
 
 // Defines symbolic names for IA64 registers.  This defines a mapping from
diff --git a/llvm/lib/Target/IA64/IA64TargetMachine.cpp b/llvm/lib/Target/IA64/IA64TargetMachine.cpp
index 70aabde5f67..e366d6a560e 100644
--- a/llvm/lib/Target/IA64/IA64TargetMachine.cpp
+++ b/llvm/lib/Target/IA64/IA64TargetMachine.cpp
@@ -20,7 +20,6 @@
 using namespace llvm;
 
 // Register the target
-extern Target TheIA64Target;
 static RegisterTarget<IA64TargetMachine> X(TheIA64Target, "ia64",
                                            "IA-64 (Itanium) [experimental]");
 
diff --git a/llvm/lib/Target/IA64/TargetInfo/IA64TargetInfo.cpp b/llvm/lib/Target/IA64/TargetInfo/IA64TargetInfo.cpp
index 00bdb203b58..e8d9072bcef 100644
--- a/llvm/lib/Target/IA64/TargetInfo/IA64TargetInfo.cpp
+++ b/llvm/lib/Target/IA64/TargetInfo/IA64TargetInfo.cpp
@@ -7,11 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "IA64.h"
 #include "llvm/Module.h"
 #include "llvm/Target/TargetRegistry.h"
 using namespace llvm;
 
-Target TheIA64Target;
+Target llvm::TheIA64Target;
 
 static unsigned IA64_JITMatchQuality() {
   return 0;