diff options
| author | Matt Arsenault <Matthew.Arsenault@amd.com> | 2025-07-02 17:29:40 +0900 |
|---|---|---|
| committer | Matt Arsenault <arsenm2@gmail.com> | 2025-07-07 10:26:36 +0900 |
| commit | 1ea9863111f0335dbf31d0bdc862f857eddfe18b (patch) | |
| tree | c0c9bfeb5297971f4be789480baabaf93d8f56ab | |
| parent | 788fc0fae471dc2d7c8b8dcf57aea7cc54ab59d5 (diff) | |
| download | llvm-users/arsenm/arm/move-sjlj-libcall-config-runtime-libcalls.zip llvm-users/arsenm/arm/move-sjlj-libcall-config-runtime-libcalls.tar.gz llvm-users/arsenm/arm/move-sjlj-libcall-config-runtime-libcalls.tar.bz2 | |
ARM: Move sjlj libcall configuration to RuntimeLibcallsusers/arsenm/arm/move-sjlj-libcall-config-runtime-libcalls
| -rw-r--r-- | llvm/lib/IR/RuntimeLibcalls.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/Target/ARM/ARMISelLowering.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/llvm/lib/IR/RuntimeLibcalls.cpp b/llvm/lib/IR/RuntimeLibcalls.cpp index 712f1a4..070131a 100644 --- a/llvm/lib/IR/RuntimeLibcalls.cpp +++ b/llvm/lib/IR/RuntimeLibcalls.cpp @@ -362,7 +362,7 @@ void RuntimeLibcallsInfo::initLibcalls(const Triple &TT, if (TT.isX86() && TT.isGNUEnvironment()) setLongDoubleIsF128Libm(*this, /*FiniteOnlyFuncs=*/true); - if (TT.isX86() || TT.isVE()) { + if (TT.isX86() || TT.isVE() || TT.isARM() || TT.isThumb()) { if (ExceptionModel == ExceptionHandling::SjLj) setLibcallImpl(RTLIB::UNWIND_RESUME, RTLIB::_Unwind_SjLj_Resume); } diff --git a/llvm/lib/Target/ARM/ARMISelLowering.cpp b/llvm/lib/Target/ARM/ARMISelLowering.cpp index 6be41a0..a487654 100644 --- a/llvm/lib/Target/ARM/ARMISelLowering.cpp +++ b/llvm/lib/Target/ARM/ARMISelLowering.cpp @@ -1400,8 +1400,6 @@ ARMTargetLowering::ARMTargetLowering(const TargetMachine &TM_, setOperationAction(ISD::EH_SJLJ_SETJMP, MVT::i32, Custom); setOperationAction(ISD::EH_SJLJ_LONGJMP, MVT::Other, Custom); setOperationAction(ISD::EH_SJLJ_SETUP_DISPATCH, MVT::Other, Custom); - if (Subtarget->useSjLjEH()) - setLibcallImpl(RTLIB::UNWIND_RESUME, RTLIB::_Unwind_SjLj_Resume); setOperationAction(ISD::SETCC, MVT::i32, Expand); setOperationAction(ISD::SETCC, MVT::f32, Expand); |