Skip to content

Commit dd96465

Browse files
committed
ARM: Move sjlj libcall configuration to RuntimeLibcalls
Manually submitting, closes #147227
1 parent 32f461b commit dd96465

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

llvm/lib/IR/RuntimeLibcalls.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ void RuntimeLibcallsInfo::initLibcalls(const Triple &TT,
343343
if (TT.isX86() && TT.isGNUEnvironment())
344344
setLongDoubleIsF128Libm(*this, /*FiniteOnlyFuncs=*/true);
345345

346-
if (TT.isX86() || TT.isVE()) {
346+
if (TT.isX86() || TT.isVE() || TT.isARM() || TT.isThumb()) {
347347
if (ExceptionModel == ExceptionHandling::SjLj)
348348
setLibcallImpl(RTLIB::UNWIND_RESUME, RTLIB::_Unwind_SjLj_Resume);
349349
}

llvm/lib/Target/ARM/ARMISelLowering.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,8 +1400,6 @@ ARMTargetLowering::ARMTargetLowering(const TargetMachine &TM_,
14001400
setOperationAction(ISD::EH_SJLJ_SETJMP, MVT::i32, Custom);
14011401
setOperationAction(ISD::EH_SJLJ_LONGJMP, MVT::Other, Custom);
14021402
setOperationAction(ISD::EH_SJLJ_SETUP_DISPATCH, MVT::Other, Custom);
1403-
if (getTargetMachine().getExceptionModel() == ExceptionHandling::SjLj)
1404-
setLibcallImpl(RTLIB::UNWIND_RESUME, RTLIB::_Unwind_SjLj_Resume);
14051403

14061404
setOperationAction(ISD::SETCC, MVT::i32, Expand);
14071405
setOperationAction(ISD::SETCC, MVT::f32, Expand);

0 commit comments

Comments
 (0)