6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 20:32:21 +00:00
Code Issues Projects Releases Wiki Activity

ADT/Triple: Renambe isOSX... methods to isMacOSX for consistency with the OS

Browse Source 
triple component.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@129838 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2011-04-20 00:14:25 +00:00
parent 4aaf3465f7
commit 558692fd0a
9 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/llvm/ADT/Triple.h
View File

@ -266,15 +266,15 @@ public:
return false;
}
/// isOSX - Is this an OS X triple. For legacy reasons, we support both
/// isMacOSX - Is this a Mac OS X triple. For legacy reasons, we support both
/// "darwin" and "osx" as OS X triples.
bool isOSX() const {
bool isMacOSX() const {
return getOS() == Triple::Darwin || getOS() == Triple::MacOSX;
}
/// isOSDarwin - Is this a "Darwin" OS (OS X or iOS).
bool isOSDarwin() const {
return isOSX() ||getOS() == Triple::IOS;
return isMacOSX() ||getOS() == Triple::IOS;
}
/// isOSWindows - Is this a "Windows" OS.
@ -283,12 +283,12 @@ public:
getOS() == Triple::MinGW32;
}
/// isOSXVersionLT - Comparison function for checking OS X version
/// isMacOSXVersionLT - Comparison function for checking OS X version
/// compatibility, which handles supporting skewed version numbering schemes
/// used by the "darwin" triples.
unsigned isOSXVersionLT(unsigned Major, unsigned Minor = 0,
unsigned isMacOSXVersionLT(unsigned Major, unsigned Minor = 0,
unsigned Micro = 0) const {
assert(isOSX() && "Not an OS X triple!");
assert(isMacOSX() && "Not an OS X triple!");
// If this is OS X, expect a sane version number.
if (getOS() == Triple::MacOSX)

2
lib/CodeGen/TargetLoweringObjectFileImpl.cpp
View File

@ -481,7 +481,7 @@ void TargetLoweringObjectFileMachO::Initialize(MCContext &Ctx,
// .comm doesn't support alignment before Leopard.
Triple T(((LLVMTargetMachine&)TM).getTargetTriple());
if (T.isOSX() && T.isOSXVersionLT(10, 5))
if (T.isMacOSX() && T.isMacOSXVersionLT(10, 5))
CommDirectiveSupportsAlignment = false;
TargetLoweringObjectFile::Initialize(Ctx, TM);

8
lib/Target/PowerPC/PPCISelLowering.cpp
View File

@ -2444,8 +2444,8 @@ unsigned PrepareCall(SelectionDAG &DAG, SDValue &Callee, SDValue &InFlag,
if (!DAG.getTarget().getSubtarget<PPCSubtarget>().isJITCodeModel()) {
unsigned OpFlags = 0;
if (DAG.getTarget().getRelocationModel() != Reloc::Static &&
(!PPCSubTarget.getTargetTriple().isOSX() ||
PPCSubTarget.getTargetTriple().isOSXVersionLT(10, 5)) &&
(!PPCSubTarget.getTargetTriple().isMacOSX() ||
PPCSubTarget.getTargetTriple().isMacOSXVersionLT(10, 5)) &&
(G->getGlobal()->isDeclaration() ||
G->getGlobal()->isWeakForLinker())) {
// PC-relative references to external symbols should go through $stub,
@ -2468,8 +2468,8 @@ unsigned PrepareCall(SelectionDAG &DAG, SDValue &Callee, SDValue &InFlag,
unsigned char OpFlags = 0;
if (DAG.getTarget().getRelocationModel() != Reloc::Static &&
(!PPCSubTarget.getTargetTriple().isOSX() ||
PPCSubTarget.getTargetTriple().isOSXVersionLT(10, 5))) {
(!PPCSubTarget.getTargetTriple().isMacOSX() ||
PPCSubTarget.getTargetTriple().isMacOSXVersionLT(10, 5))) {
// PC-relative references to external symbols should go through $stub,
// unless we're building with the leopard linker or later, which
// automatically synthesizes these stubs.

2
lib/Target/PowerPC/PPCSubtarget.h
View File

@ -138,7 +138,7 @@ public:
const Triple &getTargetTriple() const { return TargetTriple; }
/// isDarwin - True if this is any darwin platform.
bool isDarwin() const { return TargetTriple.isOSX(); }
bool isDarwin() const { return TargetTriple.isMacOSX(); }
bool isDarwinABI() const { return isDarwin(); }
bool isSVR4ABI() const { return !isDarwin(); }

4
lib/Target/TargetLibraryInfo.cpp
View File

@ -28,8 +28,8 @@ static void initialize(TargetLibraryInfo &TLI, const Triple &T) {
// memset_pattern16 is only available on iOS 3.0 and Mac OS/X 10.5 and later.
if (T.isOSX()) {
if (T.isOSXVersionLT(10, 5))
if (T.isMacOSX()) {
if (T.isMacOSXVersionLT(10, 5))
TLI.setUnavailable(LibFunc::memset_pattern16);
} else if (T.getOS() == Triple::IOS) {
if (T.isOSVersionLT(3, 0))

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

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

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

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

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

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

3
tools/llc/llc.cpp
View File

@ -280,7 +280,8 @@ int main(int argc, char **argv) {
Target.setMCUseLoc(false);
// Disable .loc support for older OS X versions.
if (TheTriple.isOSX() && TheTriple.isOSXVersionLT(10, 5))
if (TheTriple.isMacOSX() &&
TheTriple.isMacOSXVersionLT(10, 5))
Target.setMCUseLoc(false);
// Figure out where we are going to send the output...