[Mingw-w64-public] [PATCH 05/10] crt: Move amd64 setjmp and i386 _setjmp3 symbols definition to the top of the setjmp.S file

[Pali Rohár]

All symbol definitions in setjmp.S file are already at the top of the file
except the amd64 setjmp and i386 _setjmp3 symbols. Make it consistent.
---
 mingw-w64-crt/misc/setjmp.S | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/mingw-w64-crt/misc/setjmp.S b/mingw-w64-crt/misc/setjmp.S
index fae99c708d1e..1c73355fbbfb 100644
--- a/mingw-w64-crt/misc/setjmp.S
+++ b/mingw-w64-crt/misc/setjmp.S
@@ -13,14 +13,23 @@
         .def    __MINGW_USYMBOL(__intrinsic_setjmp); .scl 2; .type 32; .endef
 #endif
 
+#ifdef __x86_64__
+        .globl  __MINGW_USYMBOL(setjmp)
+        .def    __MINGW_USYMBOL(setjmp); .scl 2; .type 32; .endef
+#endif
+
 #ifndef __i386__
         .globl  __MINGW_USYMBOL(__intrinsic_setjmpex)
         .def    __MINGW_USYMBOL(__intrinsic_setjmpex); .scl 2; .type 32; .endef
 #endif
 
-#if defined(__i386__)
+#ifdef __i386__
         .globl  __MINGW_USYMBOL(_setjmp3)
         .def    __MINGW_USYMBOL(_setjmp3); .scl 2; .type 32; .endef
+#endif
+
+
+#if defined(__i386__)
 __MINGW_USYMBOL(_setjmp3):
 __MINGW_USYMBOL(__intrinsic_setjmp):
         movl    4(%esp),%ecx         /* jmp_buf */
@@ -35,8 +44,6 @@ __MINGW_USYMBOL(__intrinsic_setjmp):
         retl
 
 #elif defined(__x86_64__)
-        .globl  __MINGW_USYMBOL(setjmp)
-        .def    __MINGW_USYMBOL(setjmp); .scl 2; .type 32; .endef
 __MINGW_USYMBOL(setjmp):
 __MINGW_USYMBOL(__intrinsic_setjmp):
         xorq    %rdx,%rdx
-- 
2.20.1



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