From 67038c1333482fe2669455d67d797274be4ff8ef Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Sat, 18 Jul 2009 23:03:22 +0000
Subject: Put Target definitions inside Target specific header, and llvm
 namespace.

llvm-svn: 76344
---
 llvm/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp | 1 -
 llvm/lib/Target/Sparc/Sparc.h                        | 3 +++
 llvm/lib/Target/Sparc/SparcTargetMachine.cpp         | 1 -
 llvm/lib/Target/Sparc/TargetInfo/SparcTargetInfo.cpp | 3 ++-
 4 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'llvm/lib/Target/Sparc')

diff --git a/llvm/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp b/llvm/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp
index dce42e49191..f6a5e0b4362 100644
--- a/llvm/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp
+++ b/llvm/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp
@@ -353,7 +353,6 @@ bool SparcAsmPrinter::PrintAsmMemoryOperand(const MachineInstr *MI,
 
 // Force static initialization.
 extern "C" void LLVMInitializeSparcAsmPrinter() { 
-  extern Target TheSparcTarget;
   TargetRegistry::RegisterAsmPrinter(TheSparcTarget, 
                                      createSparcCodePrinterPass);
 }
diff --git a/llvm/lib/Target/Sparc/Sparc.h b/llvm/lib/Target/Sparc/Sparc.h
index b1981eb5f27..06ad1a4da35 100644
--- a/llvm/lib/Target/Sparc/Sparc.h
+++ b/llvm/lib/Target/Sparc/Sparc.h
@@ -30,6 +30,9 @@ namespace llvm {
                                            bool Verbose);
   FunctionPass *createSparcDelaySlotFillerPass(TargetMachine &TM);
   FunctionPass *createSparcFPMoverPass(TargetMachine &TM);
+
+  extern Target TheSparcTarget;
+
 } // end namespace llvm;
 
 // Defines symbolic names for Sparc registers.  This defines a mapping from
diff --git a/llvm/lib/Target/Sparc/SparcTargetMachine.cpp b/llvm/lib/Target/Sparc/SparcTargetMachine.cpp
index d4e215ca74a..686cf910283 100644
--- a/llvm/lib/Target/Sparc/SparcTargetMachine.cpp
+++ b/llvm/lib/Target/Sparc/SparcTargetMachine.cpp
@@ -19,7 +19,6 @@
 using namespace llvm;
 
 // Register the target.
-extern Target TheSparcTarget;
 static RegisterTarget<SparcTargetMachine> X(TheSparcTarget, "sparc", "SPARC");
 
 // Force static initialization.
diff --git a/llvm/lib/Target/Sparc/TargetInfo/SparcTargetInfo.cpp b/llvm/lib/Target/Sparc/TargetInfo/SparcTargetInfo.cpp
index 71c72d94821..131bdcc35b4 100644
--- a/llvm/lib/Target/Sparc/TargetInfo/SparcTargetInfo.cpp
+++ b/llvm/lib/Target/Sparc/TargetInfo/SparcTargetInfo.cpp
@@ -7,11 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "Sparc.h"
 #include "llvm/Module.h"
 #include "llvm/Target/TargetRegistry.h"
 using namespace llvm;
 
-Target TheSparcTarget;
+Target llvm::TheSparcTarget;
 
 static unsigned Sparc_JITMatchQuality() {
   return 0;
-- 
cgit v1.2.3