From: Vladimir Vereschaka <vvereschaka@accesssoftek.com>
Date: Sat, 6 Nov 2021 03:58:21 +0000 (-0700)
Subject: Revert "[libcxxabi][ARM] Make CXX_end_cleanup compatible with Armv6-M"
X-Git-Tag: upstream/15.0.7~26568
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c0d22dd0e745868a12662b843b9653fdad1154d8;p=platform%2Fupstream%2Fllvm.git

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
---

diff --git a/libcxxabi/src/cxa_exception.cpp b/libcxxabi/src/cxa_exception.cpp
index c8779a0..7044cb9 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)