arm64 UCRT does not provide __intrinsic_setjmp function. So emulation of
__intrinsic_setjmp for arm64 ucrtapp is not needed.
---
 mingw-w64-crt/misc/setjmp.S | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mingw-w64-crt/misc/setjmp.S b/mingw-w64-crt/misc/setjmp.S
index 2baaae49c8bf..17eb172f3dd2 100644
--- a/mingw-w64-crt/misc/setjmp.S
+++ b/mingw-w64-crt/misc/setjmp.S
@@ -7,8 +7,11 @@
 #include <_mingw_mac.h>
 
 #ifndef __arm64ec__
+
+#ifndef __aarch64__
         .globl  __MINGW_USYMBOL(__intrinsic_setjmp)
         .def    __MINGW_USYMBOL(__intrinsic_setjmp); .scl 2; .type 32; .endef
+#endif
 
 #if defined(_WIN64)
         .globl  __MINGW_USYMBOL(__intrinsic_setjmpex)
@@ -93,8 +96,6 @@ __MINGW_USYMBOL(__intrinsic_setjmp):
         mov     r0,  #0
         bx      lr
 #elif defined(__aarch64__)
-__MINGW_USYMBOL(__intrinsic_setjmp):
-        mov     x1,  #0
 __MINGW_USYMBOL(__intrinsic_setjmpex):
         str     x1,  [x0]             /* jmp_buf->Frame */
         stp     x19, x20, [x0, #0x10] /* jmp_buf->X19, X20 */
-- 
2.20.1



_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to