commit 23dfc3f608611c89d0210bb82a1157a4b164aee7
author Vladimir Vereschaka <vvereschaka@accesssoftek.com> Fri Nov 05 20:58:21 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Nov 05 21:06:00 2021 -0700
tree 132018651c34a5313d3bb926e1cfac0ff4eb2bd8
parent 76d128e3c987ed628485684c160e4933e3ce32c9

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

GitOrigin-RevId: c0d22dd0e745868a12662b843b9653fdad1154d8

src/cxa_exception.cpp

diff --git a/src/cxa_exception.cpp b/src/cxa_exception.cpp
index c8779a0..7044cb9 100644
--- a/src/cxa_exception.cpp
+++ b/src/cxa_exception.cpp
@@ -382,8 +382,7 @@
     "	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)