summaryrefslogtreecommitdiff
path: root/lib/Target/ARM/ARMISelLowering.cpp
diff options
context:
space:
mode:
authorJakob Stoklund Olesen <stoklund@2pi.dk>2013-07-04 00:26:30 +0000
committerJakob Stoklund Olesen <stoklund@2pi.dk>2013-07-04 00:26:30 +0000
commitc93822901aef17aaf8bb1303f27b47025fd1d582 (patch)
treed10880574ee192b55521a558b84b33c9d86fe2f0 /lib/Target/ARM/ARMISelLowering.cpp
parent62204220e1dc2dc21256adf765728ae257b33eac (diff)
downloadllvm-c93822901aef17aaf8bb1303f27b47025fd1d582.tar.gz
llvm-c93822901aef17aaf8bb1303f27b47025fd1d582.tar.bz2
llvm-c93822901aef17aaf8bb1303f27b47025fd1d582.tar.xz
Revert r185595-185596 which broke buildbots.
Revert "Simplify landing pad lowering." Revert "Remove the EXCEPTIONADDR, EHSELECTION, and LSDAADDR ISD opcodes." git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185600 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM/ARMISelLowering.cpp')
-rw-r--r--lib/Target/ARM/ARMISelLowering.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/Target/ARM/ARMISelLowering.cpp b/lib/Target/ARM/ARMISelLowering.cpp
index 991a703f81..9b68590f85 100644
--- a/lib/Target/ARM/ARMISelLowering.cpp
+++ b/lib/Target/ARM/ARMISelLowering.cpp
@@ -717,6 +717,8 @@ ARMTargetLowering::ARMTargetLowering(TargetMachine &TM)
if (!Subtarget->isTargetDarwin()) {
// Non-Darwin platforms may return values in these registers via the
// personality function.
+ setOperationAction(ISD::EHSELECTION, MVT::i32, Expand);
+ setOperationAction(ISD::EXCEPTIONADDR, MVT::i32, Expand);
setExceptionPointerRegister(ARM::R0);
setExceptionSelectorRegister(ARM::R1);
}