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

3 files changed, 5 insertions, 2 deletions

diff --git a/lib/Target/XCore/TargetInfo/XCoreTargetInfo.cpp b/lib/Target/XCore/TargetInfo/XCoreTargetInfo.cpp
index ce664e1b38..9dec792993 100644
--- a/lib/Target/XCore/TargetInfo/XCoreTargetInfo.cpp
+++ b/lib/Target/XCore/TargetInfo/XCoreTargetInfo.cpp
@@ -7,11 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "XCore.h"
 #include "llvm/Module.h"
 #include "llvm/Target/TargetRegistry.h"
 using namespace llvm;
 
-Target TheXCoreTarget;
+Target llvm::TheXCoreTarget;
 
 static unsigned XCore_JITMatchQuality() {
   return 0;
diff --git a/lib/Target/XCore/XCore.h b/lib/Target/XCore/XCore.h
index 75aa4fd971..b7b86304b1 100644
--- a/lib/Target/XCore/XCore.h
+++ b/lib/Target/XCore/XCore.h
@@ -27,6 +27,9 @@ namespace llvm {
   FunctionPass *createXCoreCodePrinterPass(formatted_raw_ostream &OS,
                                            TargetMachine &TM,
                                            bool Verbose);
+
+  extern Target TheXCoreTarget;
+
 } // end namespace llvm;
 
 // Defines symbolic names for XCore registers.  This defines a mapping from
diff --git a/lib/Target/XCore/XCoreTargetMachine.cpp b/lib/Target/XCore/XCoreTargetMachine.cpp
index 83a870f64f..edc437b5e3 100644
--- a/lib/Target/XCore/XCoreTargetMachine.cpp
+++ b/lib/Target/XCore/XCoreTargetMachine.cpp
@@ -18,7 +18,6 @@
 #include "llvm/Target/TargetMachineRegistry.h"
 using namespace llvm;
 
-extern Target TheXCoreTarget;
 namespace {
   // Register the target.
   RegisterTarget<XCoreTargetMachine> X(TheXCoreTarget, "xcore", "XCore");