6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-18 10:24:45 +00:00
Code Issues Projects Releases Wiki Activity

Revert r200095 and r200152. It turns out when compiling with -arch armv7 -mcpu=cortex-m3, the triple would still set iOS as the OS so the hack is still needed. rdar://15984891

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200937 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Evan Cheng
2014-02-06 18:51:34 +00:00
parent 226bd876c6
commit e75bf03611
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Target/ARM/ARMBaseRegisterInfo.cpp
View File

@@ -51,7 +51,7 @@ ARMBaseRegisterInfo::ARMBaseRegisterInfo(const ARMSubtarget &sti)
const uint16_t* const uint16_t*
ARMBaseRegisterInfo::getCalleeSavedRegs(const MachineFunction *MF) const { ARMBaseRegisterInfo::getCalleeSavedRegs(const MachineFunction *MF) const {
const uint16_t *RegList = STI.isTargetIOS() const uint16_t *RegList = (STI.isTargetIOS() && !STI.isAAPCS_ABI())
? CSR_iOS_SaveList ? CSR_iOS_SaveList
: CSR_AAPCS_SaveList; : CSR_AAPCS_SaveList;
@@ -86,7 +86,8 @@ ARMBaseRegisterInfo::getCallPreservedMask(CallingConv::ID CC) const {
if (CC == CallingConv::GHC) if (CC == CallingConv::GHC)
// This is academic becase all GHC calls are (supposed to be) tail calls // This is academic becase all GHC calls are (supposed to be) tail calls
return CSR_NoRegs_RegMask; return CSR_NoRegs_RegMask;
return STI.isTargetIOS() ? CSR_iOS_RegMask : CSR_AAPCS_RegMask; return (STI.isTargetIOS() && !STI.isAAPCS_ABI())
? CSR_iOS_RegMask : CSR_AAPCS_RegMask;
} }
const uint32_t* const uint32_t*
@@ -107,7 +108,7 @@ ARMBaseRegisterInfo::getThisReturnPreservedMask(CallingConv::ID CC) const {
if (CC == CallingConv::GHC) if (CC == CallingConv::GHC)
// This is academic becase all GHC calls are (supposed to be) tail calls // This is academic becase all GHC calls are (supposed to be) tail calls
return NULL; return NULL;
return STI.isTargetIOS() return (STI.isTargetIOS() && !STI.isAAPCS_ABI())
? CSR_iOS_ThisReturn_RegMask : CSR_AAPCS_ThisReturn_RegMask; ? CSR_iOS_ThisReturn_RegMask : CSR_AAPCS_ThisReturn_RegMask;
} }