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/X86/AsmParser/X86AsmParser.cpp b/lib/Target/X86/AsmParser/X86AsmParser.cpp
index 0871148..e548391 100644
--- a/lib/Target/X86/AsmParser/X86AsmParser.cpp
+++ b/lib/Target/X86/AsmParser/X86AsmParser.cpp
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "X86.h"
#include "llvm/Target/TargetRegistry.h"
#include "llvm/Target/TargetAsmParser.h"
using namespace llvm;
@@ -33,8 +34,6 @@
// Force static initialization.
extern "C" void LLVMInitializeX86AsmParser() {
- extern Target TheX86_32Target;
TargetRegistry::RegisterAsmParser(TheX86_32Target, &createAsmParser);
- extern Target TheX86_64Target;
TargetRegistry::RegisterAsmParser(TheX86_64Target, &createAsmParser);
}
diff --git a/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
index adb2428..b6caf30 100644
--- a/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
+++ b/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp
@@ -14,6 +14,7 @@
//
//===----------------------------------------------------------------------===//
+#include "X86.h"
#include "X86ATTAsmPrinter.h"
#include "X86IntelAsmPrinter.h"
#include "X86Subtarget.h"
@@ -36,9 +37,6 @@
// Force static initialization.
extern "C" void LLVMInitializeX86AsmPrinter() {
- extern Target TheX86_32Target;
TargetRegistry::RegisterAsmPrinter(TheX86_32Target, createX86CodePrinterPass);
-
- extern Target TheX86_64Target;
TargetRegistry::RegisterAsmPrinter(TheX86_64Target, createX86CodePrinterPass);
}
diff --git a/lib/Target/X86/TargetInfo/X86TargetInfo.cpp b/lib/Target/X86/TargetInfo/X86TargetInfo.cpp
index 9d811ab..a31f412 100644
--- a/lib/Target/X86/TargetInfo/X86TargetInfo.cpp
+++ b/lib/Target/X86/TargetInfo/X86TargetInfo.cpp
@@ -11,7 +11,7 @@
#include "llvm/Target/TargetRegistry.h"
using namespace llvm;
-Target TheX86_32Target;
+Target llvm::TheX86_32Target;
static unsigned X86_32_JITMatchQuality() {
#if defined(i386) || defined(__i386__) || defined(__x86__) || defined(_M_IX86)
@@ -47,7 +47,7 @@
return X86_32_JITMatchQuality()/2;
}
-Target TheX86_64Target;
+Target llvm::TheX86_64Target;
static unsigned X86_64_JITMatchQuality() {
#if defined(__x86_64__) || defined(_M_AMD64)
diff --git a/lib/Target/X86/X86.h b/lib/Target/X86/X86.h
index 457e18a..0c3bc39 100644
--- a/lib/Target/X86/X86.h
+++ b/lib/Target/X86/X86.h
@@ -71,6 +71,8 @@
///
FunctionPass *createX86MaxStackAlignmentCalculatorPass();
+extern Target TheX86_32Target, TheX86_64Target;
+
} // End llvm namespace
// Defines symbolic names for X86 registers. This defines a mapping from
diff --git a/lib/Target/X86/X86TargetMachine.cpp b/lib/Target/X86/X86TargetMachine.cpp
index 29f38a3..fa3ec69 100644
--- a/lib/Target/X86/X86TargetMachine.cpp
+++ b/lib/Target/X86/X86TargetMachine.cpp
@@ -24,11 +24,9 @@
using namespace llvm;
// Register the target.
-extern Target TheX86_32Target;
static RegisterTarget<X86_32TargetMachine>
X(TheX86_32Target, "x86", "32-bit X86: Pentium-Pro and above");
-extern Target TheX86_64Target;
static RegisterTarget<X86_64TargetMachine>
Y(TheX86_64Target, "x86-64", "64-bit X86: EM64T and AMD64");