arm32 UCRT provides __intrinsic_setjmpex function. So add its emulation
also for arm32 ucrtapp for compatibility.
---
 mingw-w64-crt/misc/setjmp.S | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mingw-w64-crt/misc/setjmp.S b/mingw-w64-crt/misc/setjmp.S
index 17eb172f3dd2..fae99c708d1e 100644
--- a/mingw-w64-crt/misc/setjmp.S
+++ b/mingw-w64-crt/misc/setjmp.S
@@ -13,7 +13,7 @@
         .def    __MINGW_USYMBOL(__intrinsic_setjmp); .scl 2; .type 32; .endef
 #endif
 
-#if defined(_WIN64)
+#ifndef __i386__
         .globl  __MINGW_USYMBOL(__intrinsic_setjmpex)
         .def    __MINGW_USYMBOL(__intrinsic_setjmpex); .scl 2; .type 32; .endef
 #endif
@@ -72,6 +72,7 @@ __MINGW_USYMBOL(__intrinsic_setjmpex):
 #elif defined(__arm__)
 __MINGW_USYMBOL(__intrinsic_setjmp):
         mov     r1,  #0
+__MINGW_USYMBOL(__intrinsic_setjmpex):
         str     r1,  [r0]            /* jmp_buf->Frame */
         str     r4,  [r0, #0x4]      /* jmp_buf->R4 */
         str     r5,  [r0, #0x8]      /* jmp_buf->R5 */
-- 
2.20.1



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

Reply via email to