Skip to content

Commit c0d22dd

Browse files
committed
Revert "[libcxxabi][ARM] Make CXX_end_cleanup compatible with Armv6-M"
This reverts commit 3255578. Failed buildbot's Armv7 builds: https://lab.llvm.org/buildbot/#/builders/60/builds/5303
1 parent 54d891a commit c0d22dd

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

libcxxabi/src/cxa_exception.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,7 @@ asm(" .pushsection .text.__cxa_end_cleanup,\"ax\",%progbits\n"
382382
" bl __cxa_end_cleanup_impl\n"
383383
" pop {r1, r2, r3, r4}\n"
384384
" mov lr, r4\n"
385-
" ldr r4, =_Unwind_Resume\n"
386-
" bx r4\n"
385+
" b _Unwind_Resume\n"
387386
" .popsection");
388387
#endif // defined(_LIBCXXABI_ARM_EHABI)
389388

0 commit comments

Comments
 (0)