commit 2acd0c34a929614b047ed4b9edf516e83f24f200
author Ryan Savitski <rsavitski@google.com> Wed Aug 28 21:43:39 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 28 21:43:39 2019 +0000
tree 1ccdf08c2a107a5c8b862bb71a4c67f117b444d1
parent 9e544d3077fc392ce40e87a34a622bd327f09c7d
parent 9db3486a12eb62676c733d233e918d477ea3b5cc

Merge "Add arm32 case to BIONIC_STOP_UNWIND to correctly stop unwinders"

libc/private/bionic_macros.h

diff --git a/libc/private/bionic_macros.h b/libc/private/bionic_macros.h
index 13934e5..54903f5 100644
--- a/libc/private/bionic_macros.h
+++ b/libc/private/bionic_macros.h
@@ -50,10 +50,7 @@
 }
 
 #if defined(__arm__)
-// Do not emit anything for arm, clang does not allow emiting an arm unwind
-// directive.
-// #define BIONIC_STOP_UNWIND asm volatile(".cantunwind")
-#define BIONIC_STOP_UNWIND
+#define BIONIC_STOP_UNWIND asm volatile(".cfi_undefined r14")
 #elif defined(__aarch64__)
 #define BIONIC_STOP_UNWIND asm volatile(".cfi_undefined x30")
 #elif defined(__i386__)