4 files changed, 8 insertions, 7 deletions
diff --git a/llvm/lib/Target/ARM/ARM.h b/llvm/lib/Target/ARM/ARM.h
index 1b5b828395a..5a3555a2532 100644
--- a/llvm/lib/Target/ARM/ARM.h
+++ b/llvm/lib/Target/ARM/ARM.h
@@ -111,6 +111,8 @@ FunctionPass *createARMConstantIslandPass();
 
 FunctionPass *createThumb2ITBlockPass();
 
+extern Target TheARMTarget, TheThumbTarget;
+
 } // end namespace llvm;
 
 // Defines symbolic names for ARM registers.  This defines a mapping from
diff --git a/llvm/lib/Target/ARM/ARMTargetMachine.cpp b/llvm/lib/Target/ARM/ARMTargetMachine.cpp
index a207871a5db..08bb38215e3 100644
--- a/llvm/lib/Target/ARM/ARMTargetMachine.cpp
+++ b/llvm/lib/Target/ARM/ARMTargetMachine.cpp
@@ -29,11 +29,10 @@ static cl::opt<bool> DisableIfConversion("disable-arm-if-conversion",cl::Hidden,
                               cl::desc("Disable if-conversion pass"));
 
 // Register the target.
-extern Target TheARMTarget;
-static RegisterTarget<ARMTargetMachine>   X(TheARMTarget, "arm",   "ARM");
+static RegisterTarget<ARMTargetMachine>   X(llvm::TheARMTarget, "arm",   "ARM");
 
-extern Target TheThumbTarget;
-static RegisterTarget<ThumbTargetMachine> Y(TheThumbTarget, "thumb", "Thumb");
+static RegisterTarget<ThumbTargetMachine> Y(llvm::TheThumbTarget, "thumb", 
+                                            "Thumb");
 
 // Force static initialization.
 extern "C" void LLVMInitializeARMTarget() { }
diff --git a/llvm/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp b/llvm/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
index 7270e37fa2b..e561929af5d 100644
--- a/llvm/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
+++ b/llvm/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp
@@ -1295,7 +1295,6 @@ FunctionPass *llvm::createARMCodePrinterPass(formatted_raw_ostream &o,
 
 // Force static initialization.
 extern "C" void LLVMInitializeARMAsmPrinter() { 
-  extern Target TheARMTarget, TheThumbTarget;
   TargetRegistry::RegisterAsmPrinter(TheARMTarget, createARMCodePrinterPass);
   TargetRegistry::RegisterAsmPrinter(TheThumbTarget, createARMCodePrinterPass);
 }
diff --git a/llvm/lib/Target/ARM/TargetInfo/ARMTargetInfo.cpp b/llvm/lib/Target/ARM/TargetInfo/ARMTargetInfo.cpp
index a08c915bc6a..d709463a15f 100644
--- a/llvm/lib/Target/ARM/TargetInfo/ARMTargetInfo.cpp
+++ b/llvm/lib/Target/ARM/TargetInfo/ARMTargetInfo.cpp
@@ -7,11 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "ARM.h"
 #include "llvm/Module.h"
 #include "llvm/Target/TargetRegistry.h"
 using namespace llvm;
 
-Target TheARMTarget;
+Target llvm::TheARMTarget;
 
 static unsigned ARM_JITMatchQuality() {
 #if defined(__arm__)
@@ -47,7 +48,7 @@ static unsigned ARM_ModuleMatchQuality(const Module &M) {
   return ARM_JITMatchQuality()/2;
 }
 
-Target TheThumbTarget;
+Target llvm::TheThumbTarget;
 
 static unsigned Thumb_JITMatchQuality() {
 #if defined(__thumb__)