4 files changed, 4 insertions, 3 deletions
diff --git a/llvm/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp b/llvm/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp
index 07c8ed0f82f..1bb4d42590a 100644
--- a/llvm/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp
+++ b/llvm/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp
@@ -418,7 +418,6 @@ void SystemZAsmPrinter::printModuleLevelGV(const GlobalVariable* GVar) {
 
 // Force static initialization.
 extern "C" void LLVMInitializeSystemZAsmPrinter() {
-  extern Target TheSystemZTarget;
   TargetRegistry::RegisterAsmPrinter(TheSystemZTarget,
                                      createSystemZCodePrinterPass);
 }
diff --git a/llvm/lib/Target/SystemZ/SystemZ.h b/llvm/lib/Target/SystemZ/SystemZ.h
index 88b7b02db2d..466b44787c8 100644
--- a/llvm/lib/Target/SystemZ/SystemZ.h
+++ b/llvm/lib/Target/SystemZ/SystemZ.h
@@ -50,6 +50,8 @@ namespace llvm {
                                              TargetMachine &tm,
                                              bool verbose);
 
+  extern Target TheSystemZTarget;
+
 } // end namespace llvm;
 
 // Defines symbolic names for SystemZ registers.
diff --git a/llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp b/llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp
index 01be4edf7d7..8799190e2e0 100644
--- a/llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp
+++ b/llvm/lib/Target/SystemZ/SystemZTargetMachine.cpp
@@ -18,7 +18,6 @@
 #include "llvm/Target/TargetMachineRegistry.h"
 using namespace llvm;
 
-extern Target TheSystemZTarget;
 namespace {
   // Register the target.
   RegisterTarget<SystemZTargetMachine> X(TheSystemZTarget,
diff --git a/llvm/lib/Target/SystemZ/TargetInfo/SystemZTargetInfo.cpp b/llvm/lib/Target/SystemZ/TargetInfo/SystemZTargetInfo.cpp
index c464039aaca..09cb9c3f40f 100644
--- a/llvm/lib/Target/SystemZ/TargetInfo/SystemZTargetInfo.cpp
+++ b/llvm/lib/Target/SystemZ/TargetInfo/SystemZTargetInfo.cpp
@@ -7,11 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "SystemZ.h"
 #include "llvm/Module.h"
 #include "llvm/Target/TargetRegistry.h"
 using namespace llvm;
 
-Target TheSystemZTarget;
+Target llvm::TheSystemZTarget;
 
 static unsigned SystemZ_JITMatchQuality() {
   return 0;