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

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

4 files changed, 7 insertions, 6 deletions

diff --git a/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp b/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp
index 43da443..abdd5a3 100644
--- a/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp
+++ b/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp
@@ -578,10 +578,8 @@ doFinalization(Module &M)
 
 // Force static initialization.
 extern "C" void LLVMInitializeMipsAsmPrinter() { 
-  extern Target TheMipsTarget;
   TargetRegistry::RegisterAsmPrinter(TheMipsTarget, createMipsCodePrinterPass);
 
-  extern Target TheMipselTarget;
   TargetRegistry::RegisterAsmPrinter(TheMipselTarget, 
                                      createMipsCodePrinterPass);
 }
diff --git a/lib/Target/Mips/Mips.h b/lib/Target/Mips/Mips.h
index 1ff34fb..09a8072 100644
--- a/lib/Target/Mips/Mips.h
+++ b/lib/Target/Mips/Mips.h
@@ -28,6 +28,10 @@ namespace llvm {
   FunctionPass *createMipsCodePrinterPass(formatted_raw_ostream &OS, 
                                           TargetMachine &TM,
                                           bool Verbose);
+
+  extern Target TheMipsTarget;
+  extern Target TheMipselTarget;
+
 } // end namespace llvm;
 
 // Defines symbolic names for Mips registers.  This defines a mapping from
diff --git a/lib/Target/Mips/MipsTargetMachine.cpp b/lib/Target/Mips/MipsTargetMachine.cpp
index e29a96d..e82dcee 100644
--- a/lib/Target/Mips/MipsTargetMachine.cpp
+++ b/lib/Target/Mips/MipsTargetMachine.cpp
@@ -20,10 +20,8 @@
 using namespace llvm;
 
 // Register the target.
-extern Target TheMipsTarget;
 static RegisterTarget<MipsTargetMachine>    X(TheMipsTarget, "mips", "Mips");
 
-extern Target TheMipselTarget;
 static RegisterTarget<MipselTargetMachine>  Y(TheMipselTarget, "mipsel", 
                                               "Mipsel");
 
diff --git a/lib/Target/Mips/TargetInfo/MipsTargetInfo.cpp b/lib/Target/Mips/TargetInfo/MipsTargetInfo.cpp
index 1f4dc9e..1188a74 100644
--- a/lib/Target/Mips/TargetInfo/MipsTargetInfo.cpp
+++ b/lib/Target/Mips/TargetInfo/MipsTargetInfo.cpp
@@ -7,11 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "Mips.h"
 #include "llvm/Module.h"
 #include "llvm/Target/TargetRegistry.h"
 using namespace llvm;
 
-Target TheMipsTarget;
+Target llvm::TheMipsTarget;
 
 static unsigned Mips_JITMatchQuality() {
   return 0;
@@ -40,7 +41,7 @@ static unsigned Mips_ModuleMatchQuality(const Module &M) {
   return 0;
 }
 
-Target TheMipselTarget;
+Target llvm::TheMipselTarget;
 
 static unsigned Mipsel_JITMatchQuality() {
   return 0;