RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-04-04 01:01:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Target/X86: Eliminate uses of getDarwinVers().

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@129813 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2011-04-19 21:04:12 +00:00
parent 24cfd06d03
commit 2cf711f1e6
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Target/X86/X86FastISel.cpp
View File

@ -1773,7 +1773,8 @@ bool X86FastISel::X86SelectCall(const Instruction *I) {
OpFlags = X86II::MO_PLT; OpFlags = X86II::MO_PLT;
} else if (Subtarget->isPICStyleStubAny() && } else if (Subtarget->isPICStyleStubAny() &&
(GV->isDeclaration() || GV->isWeakForLinker()) && (GV->isDeclaration() || GV->isWeakForLinker()) &&
Subtarget->getDarwinVers() < 9) { (!Subtarget->getTargetTriple().isOSX() ||
Subtarget->getTargetTriple().isOSXVersionLT(10, 5))) {
// PC-relative references to external symbols should go through $stub, // PC-relative references to external symbols should go through $stub,
// unless we're building with the leopard linker or later, which // unless we're building with the leopard linker or later, which
// automatically synthesizes these stubs. // automatically synthesizes these stubs.

6
lib/Target/X86/X86ISelLowering.cpp
View File

@ -2281,7 +2281,8 @@ X86TargetLowering::LowerCall(SDValue Chain, SDValue Callee,
OpFlags = X86II::MO_PLT; OpFlags = X86II::MO_PLT;
} else if (Subtarget->isPICStyleStubAny() && } else if (Subtarget->isPICStyleStubAny() &&
(GV->isDeclaration() || GV->isWeakForLinker()) && (GV->isDeclaration() || GV->isWeakForLinker()) &&
Subtarget->getDarwinVers() < 9) { (!Subtarget->getTargetTriple().isOSX() ||
Subtarget->getTargetTriple().isOSXVersionLT(10, 5))) {
// PC-relative references to external symbols should go through $stub, // PC-relative references to external symbols should go through $stub,
// unless we're building with the leopard linker or later, which // unless we're building with the leopard linker or later, which
// automatically synthesizes these stubs. // automatically synthesizes these stubs.
@ -2300,7 +2301,8 @@ X86TargetLowering::LowerCall(SDValue Chain, SDValue Callee,
getTargetMachine().getRelocationModel() == Reloc::PIC_) { getTargetMachine().getRelocationModel() == Reloc::PIC_) {
OpFlags = X86II::MO_PLT; OpFlags = X86II::MO_PLT;
} else if (Subtarget->isPICStyleStubAny() && } else if (Subtarget->isPICStyleStubAny() &&
Subtarget->getDarwinVers() < 9) { (!Subtarget->getTargetTriple().isOSX() ||
Subtarget->getTargetTriple().isOSXVersionLT(10, 5))) {
// PC-relative references to external symbols should go through $stub, // PC-relative references to external symbols should go through $stub,
// unless we're building with the leopard linker or later, which // unless we're building with the leopard linker or later, which
// automatically synthesizes these stubs. // automatically synthesizes these stubs.

2
lib/Target/X86/X86Subtarget.cpp
View File

@ -144,7 +144,7 @@ ClassifyGlobalReference(const GlobalValue *GV, const TargetMachine &TM) const {
/// passed as the second argument. Otherwise it returns null. /// passed as the second argument. Otherwise it returns null.
const char *X86Subtarget::getBZeroEntry() const { const char *X86Subtarget::getBZeroEntry() const {
// Darwin 10 has a __bzero entry point for this purpose. // Darwin 10 has a __bzero entry point for this purpose.
if (getDarwinVers() >= 10) if (getTargetTriple().isOSX() && !getTargetTriple().isOSXVersionLT(10, 6))
return "__bzero"; return "__bzero";
return 0; return 0;

7
lib/Target/X86/X86Subtarget.h
View File

@ -217,13 +217,6 @@ public:
return PICStyle == PICStyles::StubDynamicNoPIC || return PICStyle == PICStyles::StubDynamicNoPIC ||
PICStyle == PICStyles::StubPIC; } PICStyle == PICStyles::StubPIC; }
/// getDarwinVers - Return the darwin version number, 8 = Tiger, 9 = Leopard,
/// 10 = Snow Leopard, etc.
unsigned getDarwinVers() const {
if (isTargetDarwin()) return TargetTriple.getDarwinMajorNumber();
return 0;
}
/// ClassifyGlobalReference - Classify a global variable reference for the /// ClassifyGlobalReference - Classify a global variable reference for the
/// current subtarget according to how we should reference it in a non-pcrel /// current subtarget according to how we should reference it in a non-pcrel
/// context. /// context.