[libcxx-commits] [PATCH] D113181: [libcxxabi][ARM] Make CXX_end_cleanup compatible with Armv6-M

[Daniel Kiss via Phabricator via libcxx-commits]

This revision was automatically updated to reflect the committed changes.
danielkiss marked an inline comment as done.
Closed by commit rG3255578ee1db: [libcxxabi][ARM] Make CXX_end_cleanup compatible with Armv6-M (authored by danielkiss).
Herald added a project: libc++abi.
Herald added a subscriber: libcxx-commits.
Herald added 1 blocking reviewer(s): libc++abi.

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D113181/new/

https://reviews.llvm.org/D113181

Files:
  libcxxabi/src/cxa_exception.cpp


Index: libcxxabi/src/cxa_exception.cpp
===================================================================
--- libcxxabi/src/cxa_exception.cpp
+++ libcxxabi/src/cxa_exception.cpp
@@ -382,7 +382,8 @@
     "	bl	__cxa_end_cleanup_impl\n"
     "	pop	{r1, r2, r3, r4}\n"
     "	mov	lr, r4\n"
-    "	b	_Unwind_Resume\n"
+    "	ldr r4,	=_Unwind_Resume\n"
+    "	bx	r4\n"
     "	.popsection");
 #endif // defined(_LIBCXXABI_ARM_EHABI)
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D113181.384764.patch
Type: text/x-patch
Size: 429 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20211104/34c54328/attachment.bin>