Revert "[libcxxabi][ARM] Make CXX_end_cleanup compatible with Armv6-M"

This reverts commit 3255578ee1. Failed buildbot's Armv7 builds: https://lab.llvm.org/buildbot/#/builders/60/builds/5303
2021-11-05 20:58:21 -07:00 · 2021-11-05 20:58:21 -07:00 · c0d22dd0e7
parent 54d891a7d5
commit c0d22dd0e7
1 changed files with 1 additions and 2 deletions
--- a/libcxxabi/src/cxa_exception.cpp
+++ b/libcxxabi/src/cxa_exception.cpp
@ -382,8 +382,7 @@ asm("	.pushsection	.text.__cxa_end_cleanup,\"ax\",%progbits\n"
    "	bl	__cxa_end_cleanup_impl\n"
    "	pop	{r1, r2, r3, r4}\n"
    "	mov	lr, r4\n"
-    "	ldr r4,	=_Unwind_Resume\n"
-    "	bx	r4\n"
+    "	b	_Unwind_Resume\n"
    "	.popsection");
 #endif // defined(_LIBCXXABI_ARM_EHABI)