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

[Vladimir Vereschaka via libcxx-commits]

Author: Vladimir Vereschaka
Date: 2021-11-05T21:01:03-07:00
New Revision: c0d22dd0e745868a12662b843b9653fdad1154d8

URL: https://github.com/llvm/llvm-project/commit/c0d22dd0e745868a12662b843b9653fdad1154d8
DIFF: https://github.com/llvm/llvm-project/commit/c0d22dd0e745868a12662b843b9653fdad1154d8.diff

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

This reverts commit 3255578ee1dbb5561025ac89cd33ba08e8f26efb.

Failed buildbot's Armv7 builds:
https://lab.llvm.org/buildbot/#/builders/60/builds/5303

Added: 
    

Modified: 
    libcxxabi/src/cxa_exception.cpp

Removed: 
    


################################################################################
diff  --git a/libcxxabi/src/cxa_exception.cpp b/libcxxabi/src/cxa_exception.cpp
index c8779a0a804be..7044cb9a43f3a 100644
--- 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)