Signed-off-by: Martin Storsjö <[email protected]>
---
The latest LLVM from git supports generating SEH unwind info on ARM;
it's not yet the default, but the default will be switched from
dwarf to SEH once all relevant support patches have landed.
---
 mingw-w64-headers/crt/setjmp.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mingw-w64-headers/crt/setjmp.h b/mingw-w64-headers/crt/setjmp.h
index 3869c0870..5c139fff5 100644
--- a/mingw-w64-headers/crt/setjmp.h
+++ b/mingw-w64-headers/crt/setjmp.h
@@ -225,13 +225,13 @@ void * __cdecl __attribute__ ((__nothrow__)) mingw_getsp 
(void);
 #  ifndef _INC_SETJMPEX
 #    if defined(_X86_) || defined(__i386__)
 #      define setjmp(BUF) _setjmp3((BUF), NULL)
-#    elif defined(_ARM_) || defined(__arm__) || ((defined(_ARM64_) || 
defined(__aarch64__)) && (!defined(__SEH__) || 
!__has_builtin(__builtin_sponentry)))
+#    elif ((defined(_ARM_) || defined(__arm__) || defined(_ARM64_) || 
defined(__aarch64__)) && (!defined(__SEH__) || 
!__has_builtin(__builtin_sponentry)))
 #      define setjmp(BUF) __mingw_setjmp((BUF))
 #      define longjmp __mingw_longjmp
   int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) 
__mingw_setjmp(jmp_buf _Buf);
   __MINGW_ATTRIB_NORETURN __attribute__ ((__nothrow__)) void 
__mingw_longjmp(jmp_buf _Buf,int _Value);
 #    elif defined(__SEH__)
-#     if defined(__aarch64__) || defined(_ARM64_)
+#     if defined(__aarch64__) || defined(_ARM64_) || defined(__arm__) || 
defined(_ARM_)
 #      define setjmp(BUF) _setjmp((BUF), __builtin_sponentry())
 #     elif (__MINGW_GCC_VERSION < 40702) && !defined(__clang__)
 #      define setjmp(BUF) _setjmp((BUF), mingw_getsp())
-- 
2.25.1



_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to