summaryrefslogtreecommitdiffstats
path: root/llvm/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
commita1f5b901a58c40d57c8d68d9baf81447be95f965 (patch)
treec352bf351f11746e6117683a22aeb88c434f1a7e /llvm/lib/Target/ARM/ARMISelLowering.cpp
parent43bbaaca809935aad4c3b105596989f6530e2a65 (diff)
downloadbcm5719-llvm-a1f5b901a58c40d57c8d68d9baf81447be95f965.tar.gz
bcm5719-llvm-a1f5b901a58c40d57c8d68d9baf81447be95f965.zip
Revert r185595-185596 which broke buildbots.
Revert "Simplify landing pad lowering." Revert "Remove the EXCEPTIONADDR, EHSELECTION, and LSDAADDR ISD opcodes." llvm-svn: 185600
Diffstat (limited to 'llvm/lib/Target/ARM/ARMISelLowering.cpp')
-rw-r--r--llvm/lib/Target/ARM/ARMISelLowering.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/llvm/lib/Target/ARM/ARMISelLowering.cpp b/llvm/lib/Target/ARM/ARMISelLowering.cpp
index 991a703f818..9b68590f856 100644
--- a/llvm/lib/Target/ARM/ARMISelLowering.cpp
+++ b/llvm/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);
}
OpenPOWER on IntegriCloud