Update 20 packages

expat (2.7.1-1 -> 2.7.2-1)
libexpat (2.7.1-1 -> 2.7.2-1)
libltdl (2.5.4-3 -> 2.5.4-4)
libp11-kit (0.25.7-1 -> 0.25.9-1)
libtool (2.5.4-3 -> 2.5.4-4)
mingw-w64-i686-crt-git (13.0.0.r167.g2e31630bc-1 -> 13.0.0.r179.g8181947cc-1)
mingw-w64-i686-headers-git (13.0.0.r167.g2e31630bc-1 -> 13.0.0.r179.g8181947cc-1)
mingw-w64-i686-libmangle-git (13.0.0.r167.g2e31630bc-1 -> 13.0.0.r179.g8181947cc-1)
mingw-w64-i686-libwinpthread (13.0.0.r167.g2e31630bc-1 -> 13.0.0.r179.g8181947cc-1)
mingw-w64-i686-p11-kit (0.25.8-1 -> 0.25.9-1)
mingw-w64-i686-tools-git (13.0.0.r167.g2e31630bc-1 -> 13.0.0.r179.g8181947cc-1)
mingw-w64-i686-winpthreads (13.0.0.r167.g2e31630bc-1 -> 13.0.0.r179.g8181947cc-1)
mingw-w64-x86_64-crt-git (13.0.0.r167.g2e31630bc-1 -> 13.0.0.r179.g8181947cc-1)
mingw-w64-x86_64-headers-git (13.0.0.r167.g2e31630bc-1 -> 13.0.0.r179.g8181947cc-1)
mingw-w64-x86_64-libmangle-git (13.0.0.r167.g2e31630bc-1 -> 13.0.0.r179.g8181947cc-1)
mingw-w64-x86_64-libwinpthread (13.0.0.r167.g2e31630bc-1 -> 13.0.0.r179.g8181947cc-1)
mingw-w64-x86_64-p11-kit (0.25.8-1 -> 0.25.9-1)
mingw-w64-x86_64-tools-git (13.0.0.r167.g2e31630bc-1 -> 13.0.0.r179.g8181947cc-1)
mingw-w64-x86_64-winpthreads (13.0.0.r167.g2e31630bc-1 -> 13.0.0.r179.g8181947cc-1)
p11-kit (0.25.7-1 -> 0.25.9-1)

Signed-off-by: Git for Windows Build Agent <[email protected]>

Author: Git for Windows Build Agent

mingw32/bin/gendef.exe

@@ -521,7 +521,8 @@ extern "C" {
     __MACHINEIA64(void __rum(int))
 #ifndef __CYGWIN__
 #ifndef USE_NO_MINGW_SETJMP_TWO_ARGS
-    __MACHINE(int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf,void *))
+    __MACHINEIA32(int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf))
+    __MACHINEX64(int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf,void *))
     __MACHINEIA64(int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf,void *))
     __MACHINEX64(int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf,void *))
 #else

mingw32/bin/genidl.exe

@@ -26,7 +26,7 @@
 extern "C" {
 #endif
 
-#if (defined(_X86_) && !defined(__x86_64))
+#if defined(__i386__)
 
 #define _JBLEN 16
 #define _JBTYPE int
@@ -40,6 +40,7 @@ extern "C" {
     unsigned long Eip;
     unsigned long Registration;
     unsigned long TryLevel;
+    /* Following fields are only for new _setjmp3(), the are not for old _setjmp(). */
     unsigned long Cookie;
     unsigned long UnwindFunc;
     unsigned long UnwindData[6];
@@ -107,7 +108,7 @@ extern "C" {
 
   } _JUMP_BUFFER;
 
-#elif defined(__x86_64)
+#elif defined(__x86_64__)
 
   typedef _CRT_ALIGN(16) struct _SETJMP_FLOAT128 {
     __MINGW_EXTENSION unsigned __int64 Part[2];
@@ -202,68 +203,83 @@ extern "C" {
 #define _JMP_BUF_DEFINED
 #endif
 
-_CRTIMP __MINGW_ATTRIB_NORETURN __attribute__ ((__nothrow__)) void __cdecl longjmp(jmp_buf _Buf,int _Value);
+_CRTIMP __MINGW_ATTRIB_NORETURN __attribute__ ((__nothrow__)) void __cdecl longjmp(jmp_buf _Buf, int _Value); /* for setjmp.h and non-i386 setjmpex.h */
+#ifdef __i386__
+_CRTIMP __MINGW_ATTRIB_NORETURN __attribute__ ((__nothrow__)) void __cdecl _longjmpex(jmp_buf _Buf, int _Value); /* for i386 setjmpex.h */
+#endif
+
+#ifdef __i386__
+_CRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf _Buf); /* old i386 crtdll setjmp.h */
+_CRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp3(jmp_buf _Buf, int _Count, ...); /* new i386 msvcrt20+ setjmp.h and setjmpex.h */
+#else
+#ifndef __aarch64__
+_CRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf _Buf, void *_Frame); /* for non-i386 and non-aarch64 setjmp.h */
+#endif
+_CRTIMP int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf _Buf, void *_Frame); /* for non-i386 setjmpex.h and aarch64 setjmp.h */
+#endif
+
+#if defined(__arm__) || defined(__aarch64__)
+int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) __mingw_setjmp(jmp_buf _Buf);
+__MINGW_ATTRIB_NORETURN __attribute__ ((__nothrow__)) void __mingw_longjmp(jmp_buf _Buf, int _Value);
+#endif
 
 void * __cdecl __attribute__ ((__nothrow__)) mingw_getsp (void);
 
+#ifdef __cplusplus
+}
+#endif
+
+#pragma pack(pop)
+#endif /* _INC_SETJMP */
+
+/*
+ * Now outside of the _INC_SETJMP block, defines setjmp() and longjmp().
+ * It allows '#include <setjmpex.h>' to override the existing setjmp() and longjmp() definitions.
+ */
+
 #pragma push_macro("__has_builtin")
 #ifndef __has_builtin
   #define __has_builtin(x) 0
 #endif
 
-#ifdef _UCRT
-#  ifdef _WIN64
-#    define _setjmp __intrinsic_setjmpex
+#ifdef setjmp
+#  undef setjmp
+#endif
+#if defined(__i386__)
+#  define setjmp(BUF) _setjmp3((BUF), 0)
+#elif !defined(_INC_SETJMPEX) && (!defined(__SEH__) || defined(__USE_MINGW_SETJMP_NON_SEH))
+#  if defined(__arm__) || defined(__aarch64__)
+#    define setjmp(BUF) __mingw_setjmp((BUF))
 #  else
-#    define _setjmp __intrinsic_setjmp
+#    define setjmp(BUF) _setjmp((BUF), NULL)
 #  endif
-#elif defined(__aarch64__)
-     /* ARM64 msvcrt.dll lacks _setjmp, only has _setjmpex. */
-#  define _setjmp _setjmpex
-#endif
-#ifndef _INC_SETJMPEX
-#  if defined(_X86_) || defined(__i386__)
-#    define setjmp(BUF) _setjmp3((BUF), NULL)
-#  elif !defined(__SEH__) || defined(__USE_MINGW_SETJMP_NON_SEH)
-#    if defined(__arm__) || defined(__aarch64__)
-#      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);
-#    else
-#      define setjmp(BUF) _setjmp((BUF), NULL)
-#    endif
-#  elif __has_builtin(__builtin_sponentry)
+#elif !defined(_INC_SETJMPEX) && !defined(__aarch64__)
+#  if __has_builtin(__builtin_sponentry)
 #    define setjmp(BUF) _setjmp((BUF), __builtin_sponentry())
 #  elif (__MINGW_GCC_VERSION < 40702) && !defined(__clang__)
 #    define setjmp(BUF) _setjmp((BUF), mingw_getsp())
 #  else
-#    define setjmp(BUF) _setjmp((BUF), __builtin_frame_address (0))
+#    define setjmp(BUF) _setjmp((BUF), __builtin_frame_address(0))
 #  endif
-  int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp(jmp_buf _Buf, void *_Ctx);
-  int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmp3(jmp_buf _Buf, void *_Ctx);
 #else
-#  undef setjmp
-#  ifdef __SEH__
-#    if (__MINGW_GCC_VERSION < 40702) && !defined(__clang__)
-#      define setjmp(BUF) _setjmpex((BUF), mingw_getsp())
-#      define setjmpex(BUF) _setjmpex((BUF), mingw_getsp())
-#    else
-#      define setjmp(BUF) _setjmpex((BUF), __builtin_frame_address (0))
-#      define setjmpex(BUF) _setjmpex((BUF), __builtin_frame_address (0))
-#    endif
+#  if __has_builtin(__builtin_sponentry)
+#    define setjmp(BUF) _setjmpex((BUF), __builtin_sponentry())
+#  elif (__MINGW_GCC_VERSION < 40702) && !defined(__clang__)
+#    define setjmp(BUF) _setjmpex((BUF), mingw_getsp())
 #  else
-#    define setjmp(BUF) _setjmpex((BUF), NULL)
-#    define setjmpex(BUF) _setjmpex((BUF), NULL)
+#    define setjmp(BUF) _setjmpex((BUF), __builtin_frame_address(0))
 #  endif
-  int __cdecl __attribute__ ((__nothrow__,__returns_twice__)) _setjmpex(jmp_buf _Buf,void *_Ctx);
 #endif
 
-#pragma pop_macro("__has_builtin")
-
-#ifdef __cplusplus
-}
+#ifdef longjmp
+#  undef longjmp
 #endif
-
-#pragma pack(pop)
+#if defined(_INC_SETJMPEX) && defined(__i386__)
+#  define longjmp _longjmpex
+#elif !defined(_INC_SETJMPEX) && (!defined(__SEH__) || defined(__USE_MINGW_SETJMP_NON_SEH)) && (defined(__arm__) || defined(__aarch64__))
+#  define longjmp __mingw_longjmp
+#else
+#  define longjmp longjmp
 #endif
+
+#pragma pop_macro("__has_builtin")