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
diff --git a/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp b/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp
index 19a1c47..a3526cc 100644
--- a/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp
+++ b/lib/Target/PowerPC/AsmPrinter/PPCAsmPrinter.cpp
@@ -1095,9 +1095,7 @@
 
 // Force static initialization.
 extern "C" void LLVMInitializePowerPCAsmPrinter() { 
-  extern Target ThePPC32Target;
   TargetRegistry::RegisterAsmPrinter(ThePPC32Target, createPPCAsmPrinterPass);
 
-  extern Target ThePPC64Target;
   TargetRegistry::RegisterAsmPrinter(ThePPC64Target, createPPCAsmPrinterPass);
 }
diff --git a/lib/Target/PowerPC/PPC.h b/lib/Target/PowerPC/PPC.h
index 3aa313c..6d8974f 100644
--- a/lib/Target/PowerPC/PPC.h
+++ b/lib/Target/PowerPC/PPC.h
@@ -38,6 +38,10 @@
                                           JITCodeEmitter &MCE);
 FunctionPass *createPPCObjectCodeEmitterPass(PPCTargetMachine &TM,
                                              ObjectCodeEmitter &OCE);
+
+extern Target ThePPC32Target;
+extern Target ThePPC64Target;
+
 } // end namespace llvm;
 
 // Defines symbolic names for PowerPC registers.  This defines a mapping from
diff --git a/lib/Target/PowerPC/PPCTargetMachine.cpp b/lib/Target/PowerPC/PPCTargetMachine.cpp
index f56167e..3d5ae52 100644
--- a/lib/Target/PowerPC/PPCTargetMachine.cpp
+++ b/lib/Target/PowerPC/PPCTargetMachine.cpp
@@ -22,11 +22,9 @@
 using namespace llvm;
 
 // Register the targets
-extern Target ThePPC32Target;
 static RegisterTarget<PPC32TargetMachine>
 X(ThePPC32Target, "ppc32", "PowerPC 32");
 
-extern Target ThePPC64Target;
 static RegisterTarget<PPC64TargetMachine>
 Y(ThePPC64Target, "ppc64", "PowerPC 64");
 
diff --git a/lib/Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp b/lib/Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp
index 0502e37..ca1f490 100644
--- a/lib/Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp
+++ b/lib/Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp
@@ -7,11 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "PPC.h"
 #include "llvm/Module.h"
 #include "llvm/Target/TargetRegistry.h"
 using namespace llvm;
 
-Target ThePPC32Target;
+Target llvm::ThePPC32Target;
 
 static unsigned PPC32_JITMatchQuality() {
 #if defined(__POWERPC__) || defined (__ppc__) || defined(_POWER) || defined(__PPC__)
@@ -47,7 +48,7 @@
   return PPC32_JITMatchQuality()/2;
 }
 
-Target ThePPC64Target;
+Target llvm::ThePPC64Target;
 
 static unsigned PPC64_JITMatchQuality() {
 #if defined(__POWERPC__) || defined (__ppc__) || defined(_POWER) || defined(__PPC__)