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/PIC16/PIC16.h b/lib/Target/PIC16/PIC16.h
index 39a5119..b1df058 100644
--- a/lib/Target/PIC16/PIC16.h
+++ b/lib/Target/PIC16/PIC16.h
@@ -348,6 +348,10 @@
bool Verbose);
// Banksel optimzer pass.
FunctionPass *createPIC16MemSelOptimizerPass();
+
+ extern Target ThePIC16Target;
+ extern Target TheCooperTarget;
+
} // end namespace llvm;
// Defines symbolic names for PIC16 registers. This defines a mapping from
diff --git a/lib/Target/PIC16/PIC16TargetMachine.cpp b/lib/Target/PIC16/PIC16TargetMachine.cpp
index 9f6266c..dca6ade 100644
--- a/lib/Target/PIC16/PIC16TargetMachine.cpp
+++ b/lib/Target/PIC16/PIC16TargetMachine.cpp
@@ -23,11 +23,9 @@
using namespace llvm;
// Register the targets
-extern Target ThePIC16Target;
static RegisterTarget<PIC16TargetMachine>
X(ThePIC16Target, "pic16", "PIC16 14-bit [experimental].");
-extern Target TheCooperTarget;
static RegisterTarget<CooperTargetMachine>
Y(TheCooperTarget, "cooper", "PIC16 Cooper [experimental].");
diff --git a/lib/Target/PIC16/TargetInfo/PIC16TargetInfo.cpp b/lib/Target/PIC16/TargetInfo/PIC16TargetInfo.cpp
index 454f425..20bbba8 100644
--- a/lib/Target/PIC16/TargetInfo/PIC16TargetInfo.cpp
+++ b/lib/Target/PIC16/TargetInfo/PIC16TargetInfo.cpp
@@ -7,11 +7,12 @@
//
//===----------------------------------------------------------------------===//
+#include "PIC16.h"
#include "llvm/Module.h"
#include "llvm/Target/TargetRegistry.h"
using namespace llvm;
-Target ThePIC16Target;
+Target llvm::ThePIC16Target;
static unsigned PIC16_JITMatchQuality() {
return 0;
@@ -25,7 +26,7 @@
return 0;
}
-Target TheCooperTarget;
+Target llvm::TheCooperTarget;
static unsigned Cooper_JITMatchQuality() {
return 0;