summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorEvan Cheng <evan.cheng@apple.com>2014-01-25 19:51:19 +0000
committerEvan Cheng <evan.cheng@apple.com>2014-01-25 19:51:19 +0000
commitb8d499fe2ff637bf743647aadaa1016f0e5d4dde (patch)
treeb43e591916f8c9d4291410f7ad2e1ced270a08b7 /llvm
parent93d8f598777c1088666ca07e8612740845264f16 (diff)
downloadbcm5719-llvm-b8d499fe2ff637bf743647aadaa1016f0e5d4dde.tar.gz
bcm5719-llvm-b8d499fe2ff637bf743647aadaa1016f0e5d4dde.zip
Clean up hack which is no longer needed after r198617. No functionality change.
llvm-svn: 200095
Diffstat (limited to 'llvm')
-rw-r--r--llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp b/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp
index 79f975e3ae2..0b3e2222439 100644
--- a/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp
+++ b/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp
@@ -51,7 +51,7 @@ ARMBaseRegisterInfo::ARMBaseRegisterInfo(const ARMSubtarget &sti)
const uint16_t*
ARMBaseRegisterInfo::getCalleeSavedRegs(const MachineFunction *MF) const {
- const uint16_t *RegList = (STI.isTargetIOS() && !STI.isAAPCS_ABI())
+ const uint16_t *RegList = STI.isTargetIOS()
? CSR_iOS_SaveList
: CSR_AAPCS_SaveList;
@@ -86,8 +86,7 @@ ARMBaseRegisterInfo::getCallPreservedMask(CallingConv::ID CC) const {
if (CC == CallingConv::GHC)
// This is academic becase all GHC calls are (supposed to be) tail calls
return CSR_NoRegs_RegMask;
- return (STI.isTargetIOS() && !STI.isAAPCS_ABI())
- ? CSR_iOS_RegMask : CSR_AAPCS_RegMask;
+ return STI.isTargetIOS() ? CSR_iOS_RegMask : CSR_AAPCS_RegMask;
}
const uint32_t*
OpenPOWER on IntegriCloud