diff --git a/etc/rebase.db.i386 b/etc/rebase.db.i386
index e8289316ea0..8f8b8df419b 100644
Binary files a/etc/rebase.db.i386 and b/etc/rebase.db.i386 differ
diff --git a/mingw32/bin/gendef.exe b/mingw32/bin/gendef.exe
index 7749c99e6dd..368749d14fc 100755
Binary files a/mingw32/bin/gendef.exe and b/mingw32/bin/gendef.exe differ
diff --git a/mingw32/bin/genidl.exe b/mingw32/bin/genidl.exe
index 792f55d4044..bca5df40aed 100755
Binary files a/mingw32/bin/genidl.exe and b/mingw32/bin/genidl.exe differ
diff --git a/mingw32/bin/genpeimg.exe b/mingw32/bin/genpeimg.exe
index 35a45733e40..bc548a5b08f 100755
Binary files a/mingw32/bin/genpeimg.exe and b/mingw32/bin/genpeimg.exe differ
diff --git a/mingw32/bin/libwinpthread-1.dll b/mingw32/bin/libwinpthread-1.dll
index de06a6d7262..5bcb0bdce4a 100755
Binary files a/mingw32/bin/libwinpthread-1.dll and b/mingw32/bin/libwinpthread-1.dll differ
diff --git a/mingw32/bin/widl.exe b/mingw32/bin/widl.exe
index cfe09f62d5e..5596a48e023 100755
Binary files a/mingw32/bin/widl.exe and b/mingw32/bin/widl.exe differ
diff --git a/mingw32/include/_mingw.h b/mingw32/include/_mingw.h
index 3e6ead5bc5f..e5cfe1ef109 100644
--- a/mingw32/include/_mingw.h
+++ b/mingw32/include/_mingw.h
@@ -233,7 +233,7 @@ limitations in handling dllimport attribute.  */
 # elif defined(_UCRT)
 #  define __MSVCRT_VERSION__ 0xE00
 # else
-#  define __MSVCRT_VERSION__ 0x700
+#  define __MSVCRT_VERSION__ 0x600
 # endif
 #endif
 
diff --git a/mingw32/include/corecrt_wstdlib.h b/mingw32/include/corecrt_wstdlib.h
index 6169c2d40ac..d525397e097 100644
--- a/mingw32/include/corecrt_wstdlib.h
+++ b/mingw32/include/corecrt_wstdlib.h
@@ -10,6 +10,15 @@
 
 #ifdef __cplusplus
 extern "C" {
+#endif
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_wdupenv_s")
+#undef _wdupenv_s
+#endif
+  _CRTIMP errno_t __cdecl _wdupenv_s(wchar_t **_Buffer,size_t *_BufferSizeInWords,const wchar_t *_VarName);
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_wdupenv_s")
 #endif
 
   _CRTIMP errno_t __cdecl _itow_s (int _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix);
@@ -24,7 +33,6 @@ extern "C" {
   _CRTIMP errno_t __cdecl _wgetenv_s(size_t *_ReturnSize,wchar_t *_DstBuf,size_t _DstSizeInWords,const wchar_t *_VarName);
   __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t,_wgetenv_s,size_t*,_ReturnSize,wchar_t,_DstBuf,const wchar_t*,_VarName)
 
-  _CRTIMP errno_t __cdecl _wdupenv_s(wchar_t **_Buffer,size_t *_BufferSizeInWords,const wchar_t *_VarName);
   _CRTIMP errno_t __cdecl _i64tow_s(__int64 _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix);
   _CRTIMP errno_t __cdecl _ui64tow_s(unsigned __int64 _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix);
 
diff --git a/mingw32/include/crtdbg.h b/mingw32/include/crtdbg.h
index 2fa419e9e89..c498bcfa63f 100644
--- a/mingw32/include/crtdbg.h
+++ b/mingw32/include/crtdbg.h
@@ -4,6 +4,7 @@
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <crtdefs.h>
+#include <sal.h>
 
 #ifndef _INC_CRTDBG
 #define _INC_CRTDBG
@@ -107,6 +108,8 @@ extern "C" {
 #endif
 #endif
 
+#ifndef _DEBUG
+
 #ifndef _ASSERT
 #define _ASSERT(expr) ((void)0)
 #endif
@@ -214,6 +217,227 @@ extern "C" {
 #define _CrtSetCheckCount(f) ((int)0)
 #define _CrtGetCheckCount() ((int)0)
 
+#else /* _DEBUG */
+
+_CRTIMP long * __cdecl __p__crtAssertBusy(void);
+#define _crtAssertBusy (*__p__crtAssertBusy())
+
+_CRTIMP _CRT_REPORT_HOOK __cdecl _CrtGetReportHook(void);
+_CRTIMP _CRT_REPORT_HOOK __cdecl _CrtSetReportHook(_CRT_REPORT_HOOK _PFnNewHook);
+_CRTIMP int __cdecl _CrtSetReportHook2(int _Mode, _CRT_REPORT_HOOK _PFnNewHook);
+_CRTIMP int __cdecl _CrtSetReportHookW2(int _Mode, _CRT_REPORT_HOOKW _PFnNewHook);
+_CRTIMP int __cdecl _CrtSetReportMode(int _ReportType, int _ReportMode);
+_CRTIMP _HFILE __cdecl _CrtSetReportFile(int _ReportType, _HFILE _ReportFile);
+_CRTIMP int __cdecl _CrtDbgReport(int _ReportType, const char * _Filename, int _Linenumber, const char * _ModuleName, const char * _Format, ...);
+_CRTIMP size_t __cdecl _CrtSetDebugFillThreshold(size_t _NewDebugFillThreshold);
+_CRTIMP int __cdecl _CrtDbgReportW(int _ReportType, const wchar_t * _Filename, int _LineNumber, const wchar_t * _ModuleName, const wchar_t * _Format, ...);
+
+#define _ASSERT_EXPR(expr, msg) \
+        (void) ((!!(expr)) || \
+                (1 != _CrtDbgReportW(_CRT_ASSERT, _CRT_WIDE(__FILE__), __LINE__, NULL, msg)) || \
+                (_CrtDbgBreak(), 0))
+
+#ifndef _ASSERT
+#define _ASSERT(expr)   _ASSERT_EXPR((expr), NULL)
+#endif
+
+#ifndef _ASSERTE
+#define _ASSERTE(expr)  _ASSERT_EXPR((expr), _CRT_WIDE(#expr))
+#endif
+
+#ifndef _ASSERT_BASE
+#define _ASSERT_BASE _ASSERT_EXPR
+#endif
+
+#define _RPT_BASE(args) \
+        (void) ((1 != _CrtDbgReport args) || \
+                (_CrtDbgBreak(), 0))
+
+#define _RPT_BASE_W(args) \
+        (void) ((1 != _CrtDbgReportW args) || \
+                (_CrtDbgBreak(), 0))
+
+#define _RPT0(rptno, msg) \
+        _RPT_BASE((rptno, NULL, 0, NULL, "%s", msg))
+
+#define _RPTW0(rptno, msg) \
+        _RPT_BASE_W((rptno, NULL, 0, NULL, L"%s", msg))
+
+#define _RPT1(rptno, msg, arg1) \
+        _RPT_BASE((rptno, NULL, 0, NULL, msg, arg1))
+
+#define _RPTW1(rptno, msg, arg1) \
+        _RPT_BASE_W((rptno, NULL, 0, NULL, msg, arg1))
+
+#define _RPT2(rptno, msg, arg1, arg2) \
+        _RPT_BASE((rptno, NULL, 0, NULL, msg, arg1, arg2))
+
+#define _RPTW2(rptno, msg, arg1, arg2) \
+        _RPT_BASE_W((rptno, NULL, 0, NULL, msg, arg1, arg2))
+
+#define _RPT3(rptno, msg, arg1, arg2, arg3) \
+        _RPT_BASE((rptno, NULL, 0, NULL, msg, arg1, arg2, arg3))
+
+#define _RPTW3(rptno, msg, arg1, arg2, arg3) \
+        _RPT_BASE_W((rptno, NULL, 0, NULL, msg, arg1, arg2, arg3))
+
+#define _RPT4(rptno, msg, arg1, arg2, arg3, arg4) \
+        _RPT_BASE((rptno, NULL, 0, NULL, msg, arg1, arg2, arg3, arg4))
+
+#define _RPTW4(rptno, msg, arg1, arg2, arg3, arg4) \
+        _RPT_BASE_W((rptno, NULL, 0, NULL, msg, arg1, arg2, arg3, arg4))
+
+#define _RPT5(rptno, msg, arg1, arg2, arg3, arg4, arg5) \
+        _RPT_BASE((rptno, NULL, 0, NULL, msg, arg1, arg2, arg3, arg4, arg5))
+
+#define _RPTW5(rptno, msg, arg1, arg2, arg3, arg4, arg5) \
+        _RPT_BASE_W((rptno, NULL, 0, NULL, msg, arg1, arg2, arg3, arg4, arg5))
+
+#define _RPTF0(rptno, msg) \
+        _RPT_BASE((rptno, __FILE__, __LINE__, NULL, "%s", msg))
+
+#define _RPTFW0(rptno, msg) \
+        _RPT_BASE_W((rptno, _CRT_WIDE(__FILE__), __LINE__, NULL, L"%s", msg))
+
+#define _RPTF1(rptno, msg, arg1) \
+        _RPT_BASE((rptno, __FILE__, __LINE__, NULL, msg, arg1))
+
+#define _RPTFW1(rptno, msg, arg1) \
+        _RPT_BASE_W((rptno, _CRT_WIDE(__FILE__), __LINE__, NULL, msg, arg1))
+
+#define _RPTF2(rptno, msg, arg1, arg2) \
+        _RPT_BASE((rptno, __FILE__, __LINE__, NULL, msg, arg1, arg2))
+
+#define _RPTFW2(rptno, msg, arg1, arg2) \
+        _RPT_BASE_W((rptno, _CRT_WIDE(__FILE__), __LINE__, NULL, msg, arg1, arg2))
+
+#define _RPTF3(rptno, msg, arg1, arg2, arg3) \
+        _RPT_BASE((rptno, __FILE__, __LINE__, NULL, msg, arg1, arg2, arg3))
+
+#define _RPTFW3(rptno, msg, arg1, arg2, arg3) \
+        _RPT_BASE_W((rptno, _CRT_WIDE(__FILE__), __LINE__, NULL, msg, arg1, arg2, arg3))
+
+#define _RPTF4(rptno, msg, arg1, arg2, arg3, arg4) \
+        _RPT_BASE((rptno, __FILE__, __LINE__, NULL, msg, arg1, arg2, arg3, arg4))
+
+#define _RPTFW4(rptno, msg, arg1, arg2, arg3, arg4) \
+        _RPT_BASE_W((rptno, _CRT_WIDE(__FILE__), __LINE__, NULL, msg, arg1, arg2, arg3, arg4))
+
+#define _RPTF5(rptno, msg, arg1, arg2, arg3, arg4, arg5) \
+        _RPT_BASE((rptno, __FILE__, __LINE__, NULL, msg, arg1, arg2, arg3, arg4, arg5))
+
+#define _RPTFW5(rptno, msg, arg1, arg2, arg3, arg4, arg5) \
+        _RPT_BASE_W((rptno, _CRT_WIDE(__FILE__), __LINE__, NULL, msg, arg1, arg2, arg3, arg4, arg5))
+
+#define _CrtDbgBreak() __debugbreak()
+
+#ifdef _CRTDBG_MAP_ALLOC
+
+#define   malloc(s)             _malloc_dbg(s, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   calloc(c, s)          _calloc_dbg(c, s, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   realloc(p, s)         _realloc_dbg(p, s, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   _recalloc(p, c, s)    _recalloc_dbg(p, c, s, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   _expand(p, s)         _expand_dbg(p, s, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   free(p)               _free_dbg(p, _NORMAL_BLOCK)
+#define   _msize(p)             _msize_dbg(p, _NORMAL_BLOCK)
+#define   _aligned_msize(p, a, o)                   _aligned_msize_dbg(p, a, o)
+#define   _aligned_malloc(s, a)                     _aligned_malloc_dbg(s, a, __FILE__, __LINE__)
+#define   _aligned_realloc(p, s, a)                 _aligned_realloc_dbg(p, s, a, __FILE__, __LINE__)
+#define   _aligned_recalloc(p, c, s, a)             _aligned_recalloc_dbg(p, c, s, a, __FILE__, __LINE__)
+#define   _aligned_offset_malloc(s, a, o)           _aligned_offset_malloc_dbg(s, a, o, __FILE__, __LINE__)
+#define   _aligned_offset_realloc(p, s, a, o)       _aligned_offset_realloc_dbg(p, s, a, o, __FILE__, __LINE__)
+#define   _aligned_offset_recalloc(p, c, s, a, o)   _aligned_offset_recalloc_dbg(p, c, s, a, o, __FILE__, __LINE__)
+#define   _aligned_free(p)  _aligned_free_dbg(p)
+
+#define   _malloca(s)        _malloca_dbg(s, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   _freea(p)          _freea_dbg(p, _NORMAL_BLOCK)
+
+#define   _strdup(s)         _strdup_dbg(s, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   _wcsdup(s)         _wcsdup_dbg(s, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   _mbsdup(s)         _strdup_dbg(s, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   _tempnam(s1, s2)   _tempnam_dbg(s1, s2, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   _wtempnam(s1, s2)  _wtempnam_dbg(s1, s2, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   _fullpath(s1, s2, le)     _fullpath_dbg(s1, s2, le, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   _wfullpath(s1, s2, le)    _wfullpath_dbg(s1, s2, le, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   _getcwd(s, le)      _getcwd_dbg(s, le, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   _wgetcwd(s, le)     _wgetcwd_dbg(s, le, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   _getdcwd(d, s, le)  _getdcwd_dbg(d, s, le, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   _wgetdcwd(d, s, le) _wgetdcwd_dbg(d, s, le, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   _getdcwd_nolock(d, s, le)     _getdcwd_lk_dbg(d, s, le, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   _wgetdcwd_nolock(d, s, le)    _wgetdcwd_lk_dbg(d, s, le, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   _dupenv_s(ps1, size, s2)      _dupenv_s_dbg(ps1, size, s2, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   _wdupenv_s(ps1, size, s2)     _wdupenv_s_dbg(ps1, size, s2, _NORMAL_BLOCK, __FILE__, __LINE__)
+
+#define   strdup(s)          _strdup_dbg(s, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   wcsdup(s)          _wcsdup_dbg(s, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   tempnam(s1, s2)    _tempnam_dbg(s1, s2, _NORMAL_BLOCK, __FILE__, __LINE__)
+#define   getcwd(s, le)      _getcwd_dbg(s, le, _NORMAL_BLOCK, __FILE__, __LINE__)
+
+#endif  /* _CRTDBG_MAP_ALLOC */
+
+_CRTIMP long * __cdecl __p__crtBreakAlloc(void);
+#define _crtBreakAlloc (*__p__crtBreakAlloc())
+
+_CRTIMP long __cdecl _CrtSetBreakAlloc(long _BreakAlloc);
+
+_CRTIMP __checkReturn void * __cdecl _malloc_dbg(size_t _Size, int _BlockType, const char * _Filename, int _LineNumber);
+_CRTIMP __checkReturn void * __cdecl _calloc_dbg(size_t _NumOfElements, size_t _SizeOfElements, int _BlockType, const char * _Filename, int _LineNumber);
+_CRTIMP __checkReturn void * __cdecl _realloc_dbg(void * _Memory, size_t _NewSize, int _BlockType, const char * _Filename, int _LineNumber);
+_CRTIMP __checkReturn void * __cdecl _recalloc_dbg(void * _Memory, size_t _NumOfElements, size_t _SizeOfElements, int _BlockType, const char * _Filename, int _LineNumber);
+_CRTIMP __checkReturn void * __cdecl _expand_dbg(void * _Memory, size_t _NewSize, int _BlockType, const char * _Filename, int _LineNumber);
+_CRTIMP void __cdecl _free_dbg(void * _Memory, int _BlockType);
+_CRTIMP size_t __cdecl _msize_dbg(void * _Memory, int _BlockType);
+_CRTIMP size_t __cdecl _aligned_msize_dbg(void * _Memory, size_t _Alignment, size_t _Offset);
+_CRTIMP __checkReturn void * __cdecl _aligned_malloc_dbg(size_t _Size, size_t _Alignment, const char * _Filename, int _LineNumber);
+_CRTIMP __checkReturn void * __cdecl _aligned_realloc_dbg(void * _Memory, size_t _Size, size_t _Alignment, const char * _Filename, int _LineNumber);
+_CRTIMP __checkReturn void * __cdecl _aligned_recalloc_dbg(void * _Memory, size_t _NumOfElements, size_t _SizeOfElements, size_t _Alignment, const char * _Filename, int _LineNumber);
+_CRTIMP __checkReturn void * __cdecl _aligned_offset_malloc_dbg(size_t _Size, size_t _Alignment, size_t _Offset, const char * _Filename, int _LineNumber);
+_CRTIMP __checkReturn void * __cdecl _aligned_offset_realloc_dbg(void * _Memory, size_t _Size, size_t _Alignment, size_t _Offset, const char * _Filename, int _LineNumber);
+_CRTIMP __checkReturn void * __cdecl _aligned_offset_recalloc_dbg(void * _Memory, size_t _NumOfElements, size_t _SizeOfElements, size_t _Alignment, size_t _Offset, const char * _Filename, int _LineNumber);
+_CRTIMP void __cdecl _aligned_free_dbg(void * _Memory);
+_CRTIMP __checkReturn char * __cdecl _strdup_dbg(const char * _Str, int _BlockType, const char * _Filename, int _LineNumber);
+_CRTIMP __checkReturn wchar_t * __cdecl _wcsdup_dbg(const wchar_t * _Str, int _BlockType, const char * _Filename, int _LineNumber);
+_CRTIMP __checkReturn char * __cdecl _tempnam_dbg(const char * _DirName, const char * _FilePrefix, int _BlockType, const char * _Filename, int _LineNumber);
+_CRTIMP __checkReturn wchar_t * __cdecl _wtempnam_dbg(const wchar_t * _DirName, const wchar_t * _FilePrefix, int _BlockType, const char * _Filename, int _LineNumber);
+_CRTIMP __checkReturn char * __cdecl _fullpath_dbg(char * _FullPath, const char * _Path, size_t _SizeInBytes, int _BlockType, const char * _Filename, int _LineNumber);
+_CRTIMP __checkReturn wchar_t * __cdecl _wfullpath_dbg(wchar_t * _FullPath, const wchar_t * _Path, size_t _SizeInWords, int _BlockType, const char * _Filename, int _LineNumber);
+_CRTIMP __checkReturn char * __cdecl _getcwd_dbg(char * _DstBuf, int _SizeInBytes, int _BlockType, const char * _Filename, int _LineNumber);
+_CRTIMP __checkReturn wchar_t * __cdecl _wgetcwd_dbg(wchar_t * _DstBuf, int _SizeInWords, int _BlockType, const char * _Filename, int _LineNumber);
+_CRTIMP __checkReturn char * __cdecl _getdcwd_dbg(int _Drive, char * _DstBuf, int _SizeInBytes, int _BlockType, const char * _Filename, int _LineNumber);
+_CRTIMP __checkReturn wchar_t * __cdecl _wgetdcwd_dbg(int _Drive, wchar_t * _DstBuf, int _SizeInWords, int _BlockType, const char * _Filename, int _LineNumber);
+__checkReturn char * __cdecl _getdcwd_lk_dbg(int _Drive, char * _DstBuf, int _SizeInBytes, int _BlockType, const char * _Filename, int _LineNumber);
+__checkReturn wchar_t * __cdecl _wgetdcwd_lk_dbg(int _Drive, wchar_t * _DstBuf, int _SizeInWords, int _BlockType, const char * _Filename, int _LineNumber);
+_CRTIMP __checkReturn errno_t __cdecl _dupenv_s_dbg(char ** _PBuffer, size_t * _PBufferSizeInBytes, const char * _VarName, int _BlockType, const char * _Filename, int _LineNumber);
+_CRTIMP __checkReturn errno_t __cdecl _wdupenv_s_dbg(wchar_t ** _PBuffer, size_t * _PBufferSizeInWords, const wchar_t * _VarName, int _BlockType, const char * _Filename, int _LineNumber);
+
+#define _malloca_dbg(s, t, f, l)    _malloc_dbg(s, t, f, l)
+#define _freea_dbg(p, t)            _free_dbg(p, t)
+
+_CRTIMP _CRT_ALLOC_HOOK __cdecl _CrtGetAllocHook(void);
+_CRTIMP _CRT_ALLOC_HOOK __cdecl _CrtSetAllocHook(_CRT_ALLOC_HOOK _PfnNewHook);
+
+_CRTIMP int * __cdecl __p__crtDbgFlag(void);
+#define _crtDbgFlag (*__p__crtDbgFlag())
+
+_CRTIMP int __cdecl _CrtCheckMemory(void);
+_CRTIMP int __cdecl _CrtSetDbgFlag(int _NewFlag);
+_CRTIMP void __cdecl _CrtDoForAllClientObjects(void (__cdecl *_PFn)(void *, void *), void * _Context);
+_CRTIMP __checkReturn int __cdecl _CrtIsValidPointer(const void * _Ptr, unsigned int _Bytes, int _ReadWrite);
+_CRTIMP __checkReturn int __cdecl _CrtIsValidHeapPointer(const void * _HeapPtr);
+_CRTIMP int __cdecl _CrtIsMemoryBlock(const void * _Memory, unsigned int _Bytes, long * _RequestNumber, char ** _Filename, int * _LineNumber);
+_CRTIMP __checkReturn int __cdecl _CrtReportBlockType(const void * _Memory);
+_CRTIMP _CRT_DUMP_CLIENT __cdecl _CrtGetDumpClient(void);
+_CRTIMP _CRT_DUMP_CLIENT __cdecl _CrtSetDumpClient(_CRT_DUMP_CLIENT _PFnNewDump);
+_CRTIMP _CRT_MANAGED_HEAP_DEPRECATE void __cdecl _CrtMemCheckpoint(_CrtMemState * _State);
+_CRTIMP _CRT_MANAGED_HEAP_DEPRECATE int __cdecl _CrtMemDifference(_CrtMemState * _State, const _CrtMemState * _OldState, const _CrtMemState * _NewState);
+_CRTIMP void __cdecl _CrtMemDumpAllObjectsSince(const _CrtMemState * _State);
+_CRTIMP void __cdecl _CrtMemDumpStatistics(const _CrtMemState * _State);
+_CRTIMP int __cdecl _CrtDumpMemoryLeaks(void);
+_CRTIMP int __cdecl _CrtSetCheckCount(int _CheckCount);
+_CRTIMP int __cdecl _CrtGetCheckCount(void);
+
+#endif /* _DEBUG */
+
 #ifdef __cplusplus
 }
 /*
diff --git a/mingw32/include/ctype.h b/mingw32/include/ctype.h
index 975d21abfb2..825947677e5 100644
--- a/mingw32/include/ctype.h
+++ b/mingw32/include/ctype.h
@@ -138,8 +138,9 @@ int __cdecl isblank(int _C);
   wint_t __cdecl towupper(wint_t _C);
   wint_t __cdecl towlower(wint_t _C);
   int __cdecl iswctype(wint_t _C,wctype_t _Type);
-#if __MSVCRT_VERSION__ >= 0x800 || (__MSVCRT_VERSION__ == 0x700 && _WIN32_WINNT >= 0x0600)
-  /* These are available since msvcr80.dll, and in msvcrt.dll since Vista. */
+#if __MSVCRT_VERSION__ >= 0x800 || (__MSVCRT_VERSION__ == 0x600 && _WIN32_WINNT >= 0x0600)
+  /* These are available since msvcr80.dll (__MSVCRT_VERSION__ >= 0x800), and in
+   * msvcrt.dll (__MSVCRT_VERSION__ == 0x600) since Vista (_WIN32_WINNT >= 0x0600). */
   _CRTIMP int __cdecl _iswalpha_l(wint_t _C,_locale_t _Locale);
   _CRTIMP int __cdecl _iswupper_l(wint_t _C,_locale_t _Locale);
   _CRTIMP int __cdecl _iswlower_l(wint_t _C,_locale_t _Locale);
@@ -225,7 +226,7 @@ _CRTIMP int __cdecl ___mb_cur_max_func(void);
 #define iswgraph(_c) (iswctype(_c,_PUNCT|_ALPHA|_DIGIT))
 #define iswcntrl(_c) (iswctype(_c,_CONTROL))
 #define iswascii(_c) ((unsigned)(_c) < 0x80)
-#if __MSVCRT_VERSION__ >= 0x800 || (__MSVCRT_VERSION__ == 0x700 && _WIN32_WINNT >= 0x0600)
+#if __MSVCRT_VERSION__ >= 0x800 || (__MSVCRT_VERSION__ == 0x600 && _WIN32_WINNT >= 0x0600)
 # define _iswalpha_l(_c,_p) (_iswctype_l(_c,_ALPHA,_p))
 # define _iswupper_l(_c,_p) (_iswctype_l(_c,_UPPER,_p))
 # define _iswlower_l(_c,_p) (_iswctype_l(_c,_LOWER,_p))
diff --git a/mingw32/include/direct.h b/mingw32/include/direct.h
index e6d95f27102..df53e95f2d7 100644
--- a/mingw32/include/direct.h
+++ b/mingw32/include/direct.h
@@ -25,10 +25,23 @@ extern "C" {
   };
 #endif
 
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_getcwd")
+#undef _getcwd
+#pragma push_macro("_getdcwd")
+#undef _getdcwd
+#pragma push_macro("_getdcwd_nolock")
+#undef _getdcwd_nolock
+#endif
   _CRTIMP char *__cdecl _getcwd(char *_DstBuf,int _SizeInBytes);
   _CRTIMP char *__cdecl _getdcwd(int _Drive,char *_DstBuf,int _SizeInBytes);
 #if __MSVCRT_VERSION__ >= 0x800
   char *__cdecl _getdcwd_nolock(int _Drive,char *_DstBuf,int _SizeInBytes);
+#endif
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_getcwd")
+#pragma pop_macro("_getdcwd")
+#pragma pop_macro("_getdcwd_nolock")
 #endif
   _CRTIMP int __cdecl _chdir(const char *_Path);
   _CRTIMP int __cdecl _mkdir(const char *_Path);
@@ -46,10 +59,23 @@ extern "C" {
 
 #ifndef _WDIRECT_DEFINED
 #define _WDIRECT_DEFINED
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_wgetcwd")
+#undef _wgetcwd
+#pragma push_macro("_wgetdcwd")
+#undef _wgetdcwd
+#pragma push_macro("_wgetdcwd_nolock")
+#undef _wgetdcwd_nolock
+#endif
   _CRTIMP wchar_t *__cdecl _wgetcwd(wchar_t *_DstBuf,int _SizeInWords);
   _CRTIMP wchar_t *__cdecl _wgetdcwd(int _Drive,wchar_t *_DstBuf,int _SizeInWords);
 #if __MSVCRT_VERSION__ >= 0x800
   wchar_t *__cdecl _wgetdcwd_nolock(int _Drive,wchar_t *_DstBuf,int _SizeInWords);
+#endif
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_wgetcwd")
+#pragma pop_macro("_wgetdcwd")
+#pragma pop_macro("_wgetdcwd_nolock")
 #endif
   _CRTIMP int __cdecl _wchdir(const wchar_t *_Path);
   _CRTIMP int __cdecl _wmkdir(const wchar_t *_Path);
@@ -60,7 +86,14 @@ extern "C" {
 
 #define diskfree_t _diskfree_t
 
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("getcwd")
+#undef getcwd
+#endif
   char *__cdecl getcwd(char *_DstBuf,int _SizeInBytes) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("getcwd")
+#endif
   int __cdecl chdir(const char *_Path) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
   int __cdecl mkdir(const char *_Path) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
   int __cdecl rmdir(const char *_Path) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
diff --git a/mingw32/include/intrin.h b/mingw32/include/intrin.h
index ebd604d88ea..041c20e542b 100644
--- a/mingw32/include/intrin.h
+++ b/mingw32/include/intrin.h
@@ -55,7 +55,7 @@
 #endif
 
 #if defined(__GNUC__) && \
-   (defined(__i386__) || defined(__x86_64__))
+   (defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__)))
 #ifndef _MM_MALLOC_H_INCLUDED
 #include <stdlib.h>
 #include <errno.h>
@@ -103,7 +103,7 @@ typedef union __m128i { char v[16]; } __m128i;
 #endif
 #endif
 
-#if (defined(_X86_) || defined(__x86_64))
+#if (defined(_X86_) || (defined(__x86_64) && !defined(__arm64ec__)))
 
 #if defined(__MMX__) || defined(__MINGW_FORCE_SYS_INTRINS)
 #if defined(__cplusplus)
@@ -177,7 +177,7 @@ extern "C" {
 #define __MACHINEIA32 __MACHINEZ
 #endif
 
-#if !(defined(_X86_) || defined(__x86_64) || defined(__ia64__))
+#if !(defined(_X86_) || defined(__x86_64) || defined(__ia64__)) || defined(__arm64ec__)
 #undef __MACHINEIW64
 #define __MACHINEIW64 __MACHINEZ
 #endif
@@ -187,17 +187,17 @@ extern "C" {
 #define __MACHINEIA64 __MACHINEZ
 #endif
 
-#if !(defined(__ia64__) || defined(__x86_64))
+#if !(defined(__ia64__) || defined(__x86_64)) || defined(__arm64ec__)
 #undef __MACHINEW64
 #define __MACHINEW64 __MACHINEZ
 #endif
 
-#if !(defined(_X86_) || defined(__x86_64))
+#if !(defined(_X86_) || defined(__x86_64)) || defined(__arm64ec__)
 #undef __MACHINEI
 #define __MACHINEI __MACHINEZ
 #endif
 
-#if !(defined(_X86_) || defined(__x86_64))
+#if !(defined(_X86_) || defined(__x86_64)) || defined(__arm64ec__)
 #undef __MACHINEX86X
 #define __MACHINEX86X __MACHINEZ
 #endif
@@ -207,7 +207,7 @@ extern "C" {
 #define __MACHINEX86X_NOX64 __MACHINEZ
 #endif
 
-#if !(defined(_X86_) || defined(__x86_64)) || defined(__ia64__)
+#if !(defined(_X86_) || defined(__x86_64)) || defined(__ia64__) || defined(__arm64ec__)
 #undef __MACHINEX86X_NOIA64
 #define __MACHINEX86X_NOIA64 __MACHINEZ
 #endif
@@ -228,17 +228,17 @@ extern "C" {
 #define __MACHINECC __MACHINEZ
 #endif
 
-#if !(defined(__aarch64__))
+#if !(defined(__aarch64__) || defined(__arm64ec__))
 #undef __MACHINEARM64
 #define __MACHINEARM64 __MACHINEZ
 #endif
 
-#if !(defined(__arm__) || defined(__aarch64__))
+#if !(defined(__arm__) || defined(__aarch64__) || defined(__arm64ec__))
 #undef __MACHINEARM_ARM64
 #define __MACHINEARM_ARM64 __MACHINEZ
 #endif
 
-#if !(defined(__x86_64))
+#if !(defined(__x86_64)) || defined(__arm64ec__)
 #undef __MACHINEX64
 #define __MACHINEX64 __MACHINEZ
 #endif
diff --git a/mingw32/include/io.h b/mingw32/include/io.h
index 4994191a967..a6dc2f8a1bb 100644
--- a/mingw32/include/io.h
+++ b/mingw32/include/io.h
@@ -24,7 +24,15 @@
 extern "C" {
 #endif
 
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_getcwd")
+#undef _getcwd
+#endif
 _CRTIMP char* __cdecl _getcwd (char*, int);
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_getcwd")
+#endif
+
 #ifndef _FSIZE_T_DEFINED
   typedef unsigned long _fsize_t;
 #define _FSIZE_T_DEFINED
@@ -278,7 +286,14 @@ _CRTIMP char* __cdecl _getcwd (char*, int);
 #ifndef NO_OLDNAMES
 #ifndef _UWIN
   int __cdecl chdir (const char *) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("getcwd")
+#undef getcwd
+#endif
   char *__cdecl getcwd (char *, int) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("getcwd")
+#endif
   int __cdecl mkdir (const char *) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
   char *__cdecl mktemp(char *) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
   int __cdecl rmdir (const char*) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
diff --git a/mingw32/include/malloc.h b/mingw32/include/malloc.h
index d02f3ee7bf5..9c498c2918b 100644
--- a/mingw32/include/malloc.h
+++ b/mingw32/include/malloc.h
@@ -61,6 +61,36 @@ extern "C" {
 
 #ifndef _CRT_ALLOCATION_DEFINED
 #define _CRT_ALLOCATION_DEFINED
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("calloc")
+#undef calloc
+#pragma push_macro("free")
+#undef free
+#pragma push_macro("malloc")
+#undef malloc
+#pragma push_macro("realloc")
+#undef realloc
+#pragma push_macro("_aligned_free")
+#undef _aligned_free
+#pragma push_macro("_aligned_malloc")
+#undef _aligned_malloc
+#pragma push_macro("_aligned_offset_malloc")
+#undef _aligned_offset_malloc
+#pragma push_macro("_aligned_realloc")
+#undef _aligned_realloc
+#pragma push_macro("_aligned_offset_realloc")
+#undef _aligned_offset_realloc
+#pragma push_macro("_recalloc")
+#undef _recalloc
+#pragma push_macro("_aligned_recalloc")
+#undef _aligned_recalloc
+#pragma push_macro("_aligned_offset_recalloc")
+#undef _aligned_offset_recalloc
+#pragma push_macro("_aligned_msize")
+#undef _aligned_msize
+#endif
+
   void *__cdecl calloc(size_t _NumOfElements,size_t _SizeOfElements);
   void __cdecl free(void *_Memory);
   void *__cdecl malloc(size_t _Size);
@@ -78,6 +108,23 @@ extern "C" {
   _CRTIMP void *__cdecl _aligned_offset_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment,size_t _Offset);
   _CRTIMP size_t __cdecl _aligned_msize(void *_Memory,size_t _Alignment,size_t _Offset);
 # endif
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("calloc")
+#pragma pop_macro("free")
+#pragma pop_macro("malloc")
+#pragma pop_macro("realloc")
+#pragma pop_macro("_aligned_free")
+#pragma pop_macro("_aligned_malloc")
+#pragma pop_macro("_aligned_offset_malloc")
+#pragma pop_macro("_aligned_realloc")
+#pragma pop_macro("_aligned_offset_realloc")
+#pragma pop_macro("_recalloc")
+#pragma pop_macro("_aligned_recalloc")
+#pragma pop_macro("_aligned_offset_recalloc")
+#pragma pop_macro("_aligned_msize")
+#endif
+
 #endif
 
 /* Users should really use MS provided versions */
@@ -98,8 +145,19 @@ void * __mingw_aligned_realloc (void *_Memory, size_t _Size, size_t _Offset);
 #endif /* _CRT_USE_WINAPI_FAMILY_DESKTOP_APP */
   _CRTIMP unsigned long __cdecl _set_malloc_crt_max_wait(unsigned long _NewValue);
 
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_expand")
+#undef _expand
+#pragma push_macro("_msize")
+#undef _msize
+#endif
   _CRTIMP void *__cdecl _expand(void *_Memory,size_t _NewSize);
   _CRTIMP size_t __cdecl _msize(void *_Memory);
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_expand")
+#pragma pop_macro("_msize")
+#endif
+
 #ifdef __GNUC__
 #undef _alloca
 #define _alloca(x) __builtin_alloca((x))
@@ -138,11 +196,20 @@ void * __mingw_aligned_realloc (void *_Memory, size_t _Size, size_t _Offset);
   }
 #endif
 
+#ifdef _DEBUG
+#ifndef _CRTDBG_MAP_ALLOC
+#undef _malloca
+#define _malloca(size) \
+    _MarkAllocaS(malloc((size) + _ALLOCA_S_MARKER_SIZE), _ALLOCA_S_HEAP_MARKER)
+#endif
+#else
 #undef _malloca
 #define _malloca(size) \
   ((((size) + _ALLOCA_S_MARKER_SIZE) <= _ALLOCA_S_THRESHOLD) ? \
     _MarkAllocaS(_alloca((size) + _ALLOCA_S_MARKER_SIZE),_ALLOCA_S_STACK_MARKER) : \
     _MarkAllocaS(malloc((size) + _ALLOCA_S_MARKER_SIZE),_ALLOCA_S_HEAP_MARKER))
+#endif
+
 #undef _FREEA_INLINE
 #define _FREEA_INLINE
 
diff --git a/mingw32/include/mbstring.h b/mingw32/include/mbstring.h
index b6e48a88399..e9e43a13a1e 100644
--- a/mingw32/include/mbstring.h
+++ b/mingw32/include/mbstring.h
@@ -31,7 +31,14 @@ extern "C" {
 
 #ifndef _MBSTRING_DEFINED
 #define _MBSTRING_DEFINED
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_mbsdup")
+#undef _mbsdup
+#endif
   _CRTIMP unsigned char *__cdecl _mbsdup(const unsigned char *_Str);
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_mbsdup")
+#endif
   _CRTIMP unsigned int __cdecl _mbbtombc(unsigned int _Ch);
   _CRTIMP unsigned int __cdecl _mbbtombc_l(unsigned int _Ch,_locale_t _Locale);
   _CRTIMP int __cdecl _mbbtype(unsigned char _Ch,int _CType);
diff --git a/mingw32/include/psdk_inc/intrin-impl.h b/mingw32/include/psdk_inc/intrin-impl.h
index 872246a445a..e109c15d06a 100644
--- a/mingw32/include/psdk_inc/intrin-impl.h
+++ b/mingw32/include/psdk_inc/intrin-impl.h
@@ -134,7 +134,7 @@ __INTRINSICS_USEINLINE
    FunctionName: Any valid function name
    DataType: __LONG32 or __int64
    OffsetConstraint: either "I" for 32bit data types or "J" for 64. */
-#if defined(__x86_64__) || defined(_AMD64_) || defined(__i386__) || defined(_X86_)
+#if (defined(__x86_64__) && !defined(__arm64ec__)) || (defined(_AMD64_) && !defined(_ARM64EC_)) || defined(__i386__) || defined(_X86_)
 #define __buildbittesti(x, y, z, a) unsigned char x(y volatile *Base, y Offset) \
 { \
    unsigned char old; \
@@ -162,7 +162,7 @@ __INTRINSICS_USEINLINE
       : "memory", "cc"); \
    return (old >> Offset) & 1; \
 }
-#elif defined(__aarch64__) || defined(_ARM64_)
+#elif defined(__aarch64__) || defined(_ARM64_) || defined(__arm64ec__) || defined(_ARM64EC_)
 #define __buildbittesti(x, y, z, a) unsigned char x(y volatile *Base, y Offset) \
 { \
    unsigned int old, tmp1, tmp2; \
@@ -198,7 +198,7 @@ __INTRINSICS_USEINLINE
       : "memory", "cc"); \
    return (old >> Offset) & 1; \
 }
-#endif /* defined(__x86_64__) || defined(_AMD64_) || defined(__i386__) || defined(_X86_) */
+#endif /* (defined(__x86_64__) && !defined(__arm64ec__)) || (defined(_AMD64_) && !defined(_ARM64EC_)) || defined(__i386__) || defined(_X86_) */
 
 /* This macro is used by YieldProcessor when compiling x86 w/o SSE2.
 It generates the same opcodes as _mm_pause.  */
@@ -668,8 +668,7 @@ unsigned short _rotr16(unsigned short __X, unsigned char __C)
 #define __INTRINSIC_DEFINED__rotr16
 #endif /* __INTRINSIC_PROLOG */
 
-#if defined(__x86_64__) || defined(_AMD64_)
-
+#if (defined(__x86_64__) && !defined(__arm64ec__)) || (defined(_AMD64_) && !defined(_ARM64EC_))
 #if __INTRINSIC_PROLOG(__faststorefence)
 void __faststorefence(void);
 #if !__has_builtin(__faststorefence)
@@ -1103,7 +1102,7 @@ unsigned __int64 __shiftright128 (unsigned __int64  LowPart, unsigned __int64 Hi
 #define __INTRINSIC_DEFINED___shiftright128
 #endif /* __INTRINSIC_PROLOG */
 
-#endif /* defined(__x86_64__) || defined(_AMD64_) */
+#endif /* #(defined(__x86_64__) && !defined(__arm64ec__)) || (defined(_AMD64_) && !defined(_ARM64EC_)) */
 
 /* ***************************************************** */
 
@@ -1195,7 +1194,7 @@ unsigned char _BitScanReverse(unsigned __LONG32 *Index, unsigned __LONG32 Mask)
 
 #endif /* defined(__arm__) || defined(_ARM_) */
 
-#if defined(__aarch64__) || defined(_ARM64_)
+#if defined(__aarch64__) || defined(_ARM64_) || defined(__arm64ec__) || defined(_ARM64EC_)
 
 #if __INTRINSIC_PROLOG(_interlockedbittestandset)
 unsigned char _interlockedbittestandset(__LONG32 volatile *a, __LONG32 b);
@@ -1436,9 +1435,9 @@ unsigned char _BitScanReverse64(unsigned __LONG32 *Index, unsigned __int64 Mask)
 #define __INTRINSIC_DEFINED__BitScanReverse64
 #endif /* __INTRINSIC_PROLOG */
 
-#endif /* defined(__aarch64__) || define(_ARM64_) */
+#endif /* defined(__aarch64__) || define(_ARM64_) || defined(__arm64ec__) || defined(_ARM64EC_) */
 
-#if defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_)
+#if defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) || defined(__arm64ec__) || defined(_ARM64EC_)
 
 #if __INTRINSIC_PROLOG(_bittest)
 unsigned char _bittest(const __LONG32 *__a, __LONG32 __b);
@@ -1494,9 +1493,9 @@ unsigned char _bittestandcomplement(__LONG32 *__a, __LONG32 __b)
 #define __INTRINSIC_DEFINED__bittestandcomplement
 #endif /* __INTRINSIC_PROLOG */
 
-#endif /* defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) */
+#endif /* defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) || defined(__arm64ec__) || defined(_ARM64EC_) */
 
-#if defined(__aarch64__) || defined(_ARM64_)
+#if defined(__aarch64__) || defined(_ARM64_) || defined(__arm64ec__) || defined(_ARM64EC_)
 
 #if __INTRINSIC_PROLOG(_bittest64)
 unsigned char _bittest64(const __int64 *__a, __int64 __b);
@@ -1552,7 +1551,7 @@ unsigned char _bittestandcomplement64(__int64 *__a, __int64 __b)
 #define __INTRINSIC_DEFINED__bittestandcomplement64
 #endif /* __INTRINSIC_PROLOG */
 
-#endif /* defined(__aarch64__) || define(_ARM64_) */
+#endif /* defined(__aarch64__) || define(_ARM64_) || defined(__arm64ec__) || defined(_ARM64EC_) */
 
 /* ***************************************************** */
 
@@ -1777,7 +1776,7 @@ void *_InterlockedExchangePointer(void *volatile *Target,void *Value) {
 
 #endif /* defined(__x86_64__) || defined(_AMD64_) || defined(__i386__) || defined(_X86_) || defined(__arm__) || defined(_ARM_) || defined(__aarch64__) || defined(_ARM64_) */
 
-#if defined(__x86_64__) || defined(_AMD64_) || defined(__i386__) || defined(_X86_)
+#if (defined(__x86_64__) && !defined(__arm64ec__)) || (defined(_AMD64_) && !defined(_ARM64EC_)) || defined(__i386__) || defined(_X86_)
 
 #if __INTRINSIC_PROLOG(__int2c)
 void __int2c(void);
@@ -2157,7 +2156,7 @@ unsigned __int64 _xgetbv(unsigned int index)
 #endif /* __INTRINSIC_PROLOG */
 #endif /* __GNUC__ < 8 */
 
-#endif /* defined(__x86_64__) || defined(_AMD64_) || defined(__i386__) || defined(_X86_) */
+#endif /* (defined(__x86_64__) && !defined(__arm64ec__)) || (defined(_AMD64_) && !defined(_ARM64EC_)) || defined(__i386__) || defined(_X86_) */
 
 /* ***************************************************** */
 
diff --git a/mingw32/include/sec_api/stdlib_s.h b/mingw32/include/sec_api/stdlib_s.h
index f7d76fecb16..32f4767e4d4 100644
--- a/mingw32/include/sec_api/stdlib_s.h
+++ b/mingw32/include/sec_api/stdlib_s.h
@@ -12,8 +12,16 @@
 extern "C" {
 #endif
 
-  _CRTIMP void * __cdecl bsearch_s(const void *_Key,const void *_Base,rsize_t _NumOfElements,rsize_t _SizeOfElements,int (__cdecl * _PtFuncCompare)(void *, const void *, const void *), void *_Context);
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_dupenv_s")
+#undef _dupenv_s
+#endif
   _CRTIMP errno_t __cdecl _dupenv_s(char **_PBuffer,size_t *_PBufferSizeInBytes,const char *_VarName);
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_dupenv_s")
+#endif
+
+  _CRTIMP void * __cdecl bsearch_s(const void *_Key,const void *_Base,rsize_t _NumOfElements,rsize_t _SizeOfElements,int (__cdecl * _PtFuncCompare)(void *, const void *, const void *), void *_Context);
   _CRTIMP errno_t __cdecl getenv_s(size_t *_ReturnSize,char *_DstBuf,rsize_t _DstSize,const char *_VarName);
   __DEFINE_CPP_OVERLOAD_SECURE_FUNC_1_1(errno_t, getenv_s, size_t *, _ReturnSize, char, _Dest, const char *, _VarName)
   _CRTIMP errno_t __cdecl _itoa_s(int _Value,char *_DstBuf,size_t _Size,int _Radix);
diff --git a/mingw32/include/stdio.h b/mingw32/include/stdio.h
index d6227f68986..7e0d3d9175f 100644
--- a/mingw32/include/stdio.h
+++ b/mingw32/include/stdio.h
@@ -540,8 +540,15 @@ int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_li
   _CRTIMP int __cdecl _fileno(FILE *_File);
 #ifdef _POSIX_
   int __cdecl fileno(FILE *_File) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
+#endif
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_tempnam")
+#undef _tempnam
 #endif
   _CRTIMP char *__cdecl _tempnam(const char *_DirName,const char *_FilePrefix);
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_tempnam")
+#endif
   _CRTIMP int __cdecl _flushall(void);
   FILE *__cdecl fopen(const char * __restrict__ _Filename,const char * __restrict__ _Mode) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
   FILE *fopen64(const char * __restrict__ filename,const char * __restrict__  mode);
@@ -1309,7 +1316,14 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti
 #endif
 #endif
 
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_wtempnam")
+#undef _wtempnam
+#endif
   _CRTIMP wchar_t *__cdecl _wtempnam(const wchar_t *_Directory,const wchar_t *_FilePrefix);
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_wtempnam")
+#endif
   _CRTIMP int __cdecl _snwscanf(const wchar_t * __restrict__ _Src,size_t _MaxCount,const wchar_t * __restrict__ _Format,...);
   _CRTIMP FILE *__cdecl _wfdopen(int _FileHandle ,const wchar_t *_Mode);
   _CRTIMP FILE *__cdecl _wfopen(const wchar_t * __restrict__ _Filename,const wchar_t *__restrict__  _Mode) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
@@ -1387,7 +1401,14 @@ int vsnwprintf (wchar_t *__stream, size_t __n, const wchar_t *__format, __builti
 #define P_tmpdir _P_tmpdir
 #define SYS_OPEN _SYS_OPEN
 
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("tempnam")
+#undef tempnam
+#endif
   char *__cdecl tempnam(const char *_Directory,const char *_FilePrefix) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("tempnam")
+#endif
   int __cdecl fcloseall(void) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
   FILE *__cdecl fdopen(int _FileHandle,const char *_Format) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
   int __cdecl fgetchar(void) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
diff --git a/mingw32/include/stdlib.h b/mingw32/include/stdlib.h
index dabeb3cdb61..d43fa33b7f2 100644
--- a/mingw32/include/stdlib.h
+++ b/mingw32/include/stdlib.h
@@ -419,6 +419,36 @@ float __cdecl __MINGW_NOTHROW strtof(const char * __restrict__ _Str,char ** __re
 
 #ifndef _CRT_ALLOCATION_DEFINED
 #define _CRT_ALLOCATION_DEFINED
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("calloc")
+#undef calloc
+#pragma push_macro("free")
+#undef free
+#pragma push_macro("malloc")
+#undef malloc
+#pragma push_macro("realloc")
+#undef realloc
+#pragma push_macro("_aligned_free")
+#undef _aligned_free
+#pragma push_macro("_aligned_malloc")
+#undef _aligned_malloc
+#pragma push_macro("_aligned_offset_malloc")
+#undef _aligned_offset_malloc
+#pragma push_macro("_aligned_realloc")
+#undef _aligned_realloc
+#pragma push_macro("_aligned_offset_realloc")
+#undef _aligned_offset_realloc
+#pragma push_macro("_recalloc")
+#undef _recalloc
+#pragma push_macro("_aligned_recalloc")
+#undef _aligned_recalloc
+#pragma push_macro("_aligned_offset_recalloc")
+#undef _aligned_offset_recalloc
+#pragma push_macro("_aligned_msize")
+#undef _aligned_msize
+#endif
+
   void *__cdecl calloc(size_t _NumOfElements,size_t _SizeOfElements);
   void __cdecl free(void *_Memory);
   void *__cdecl malloc(size_t _Size);
@@ -434,6 +464,23 @@ float __cdecl __MINGW_NOTHROW strtof(const char * __restrict__ _Str,char ** __re
   _CRTIMP void *__cdecl _aligned_offset_recalloc(void *_Memory,size_t _Count,size_t _Size,size_t _Alignment,size_t _Offset);
   _CRTIMP size_t __cdecl _aligned_msize(void *_Memory,size_t _Alignment,size_t _Offset);
 # endif
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("calloc")
+#pragma pop_macro("free")
+#pragma pop_macro("malloc")
+#pragma pop_macro("realloc")
+#pragma pop_macro("_aligned_free")
+#pragma pop_macro("_aligned_malloc")
+#pragma pop_macro("_aligned_offset_malloc")
+#pragma pop_macro("_aligned_realloc")
+#pragma pop_macro("_aligned_offset_realloc")
+#pragma pop_macro("_recalloc")
+#pragma pop_macro("_aligned_recalloc")
+#pragma pop_macro("_aligned_offset_recalloc")
+#pragma pop_macro("_aligned_msize")
+#endif
+
 #endif
 
 #ifndef _WSTDLIB_DEFINED
@@ -497,7 +544,16 @@ float __cdecl __MINGW_NOTHROW strtof(const char * __restrict__ _Str,char ** __re
 
 #ifndef _POSIX_
 #define _CVTBUFSIZE (309+40)
+
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_fullpath")
+#undef _fullpath
+#endif
   _CRTIMP char *__cdecl _fullpath(char *_FullPath,const char *_Path,size_t _SizeInBytes);
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_fullpath")
+#endif
+
   _CRTIMP char *__cdecl _ecvt(double _Val,int _NumOfDigits,int *_PtDec,int *_PtSign) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
   _CRTIMP char *__cdecl _fcvt(double _Val,int _NumOfDec,int *_PtDec,int *_PtSign) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
   _CRTIMP char *__cdecl _gcvt(double _Val,int _NumOfDigits,char *_DstBuf) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
@@ -559,7 +615,14 @@ unsigned long __cdecl _lrotr(unsigned long,int);
 
 #ifndef _WSTDLIBP_DEFINED
 #define _WSTDLIBP_DEFINED
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_wfullpath")
+#undef _wfullpath
+#endif
   _CRTIMP wchar_t *__cdecl _wfullpath(wchar_t *_FullPath,const wchar_t *_Path,size_t _SizeInWords);
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_wfullpath")
+#endif
   _CRTIMP void __cdecl _wmakepath(wchar_t *_ResultPath,const wchar_t *_Drive,const wchar_t *_Dir,const wchar_t *_Filename,const wchar_t *_Ext);
 #ifndef _CRT_WPERROR_DEFINED
 #define _CRT_WPERROR_DEFINED
diff --git a/mingw32/include/string.h b/mingw32/include/string.h
index 813cd5bec59..1832e38ed85 100644
--- a/mingw32/include/string.h
+++ b/mingw32/include/string.h
@@ -64,7 +64,14 @@ extern "C" {
   size_t __cdecl strlen(const char *_Str);
   size_t __cdecl strnlen(const char *_Str,size_t _MaxCount);
   void *__cdecl memmove(void *_Dst,const void *_Src,size_t _Size) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_strdup")
+#undef _strdup
+#endif
   _CRTIMP char *__cdecl _strdup(const char *_Src);
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_strdup")
+#endif
   _CONST_RETURN char *__cdecl strchr(const char *_Str,int _Val);
   _CRTIMP int __cdecl _stricmp(const char *_Str1,const char *_Str2);
   _CRTIMP int __cdecl _strcmpi(const char *_Str1,const char *_Str2);
@@ -105,7 +112,14 @@ extern "C" {
   _CRTIMP size_t __cdecl _strxfrm_l(char * __restrict__ _Dst,const char * __restrict__ _Src,size_t _MaxCount,_locale_t _Locale);
 
 #ifndef	NO_OLDNAMES
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("strdup")
+#undef strdup
+#endif
   char *__cdecl strdup(const char *_Src) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("strdup")
+#endif
   int __cdecl strcmpi(const char *_Str1,const char *_Str2) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
   int __cdecl stricmp(const char *_Str1,const char *_Str2) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
   char *__cdecl strlwr(char *_Str) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
@@ -128,7 +142,14 @@ extern "C" {
 #ifndef _WSTRING_DEFINED
 #define _WSTRING_DEFINED
 
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_wcsdup")
+#undef _wcsdup
+#endif
   _CRTIMP wchar_t *__cdecl _wcsdup(const wchar_t *_Str);
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_wcsdup")
+#endif
   wchar_t *__cdecl wcscat(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Source) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
   _CONST_RETURN wchar_t *__cdecl wcschr(const wchar_t *_Str,wchar_t _Ch);
   int __cdecl wcscmp(const wchar_t *_Str1,const wchar_t *_Str2);
@@ -177,7 +198,14 @@ extern "C" {
   _CRTIMP int __cdecl _wcsnicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale);
 
 #ifndef	NO_OLDNAMES
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("wcsdup")
+#undef wcsdup
+#endif
   wchar_t *__cdecl wcsdup(const wchar_t *_Str) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("wcsdup")
+#endif
 #define wcswcs wcsstr
   int __cdecl wcsicmp(const wchar_t *_Str1,const wchar_t *_Str2) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
   int __cdecl wcsnicmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
diff --git a/mingw32/include/tchar.h b/mingw32/include/tchar.h
index 3069d7139da..aabf3778746 100644
--- a/mingw32/include/tchar.h
+++ b/mingw32/include/tchar.h
@@ -133,7 +133,7 @@ extern "C" {
 #define _tenviron _wenviron
 #define __targv __wargv
 
-#define _tprintf wprintf
+#define _tprintf __ms_wprintf
 #define _tprintf_l _wprintf_l
 #define _tprintf_p _wprintf_p
 #define _tprintf_p_l _wprintf_p_l
@@ -145,7 +145,7 @@ extern "C" {
 #define _vtcprintf_l _vcwprintf_l
 #define _vtcprintf_p _vcwprintf_p
 #define _vtcprintf_p_l _vcwprintf_p_l
-#define _ftprintf fwprintf
+#define _ftprintf __ms_fwprintf
 #define _ftprintf_l _fwprintf_l
 #define _ftprintf_p _fwprintf_p
 #define _ftprintf_p_l _fwprintf_p_l
@@ -159,11 +159,11 @@ extern "C" {
 #define _sctprintf_p_l _scwprintf_p_l
 #define _sntprintf _snwprintf
 #define _sntprintf_l _snwprintf_l
-#define _vtprintf vwprintf
+#define _vtprintf __ms_vwprintf
 #define _vtprintf_l _vwprintf_l
 #define _vtprintf_p _vwprintf_p
 #define _vtprintf_p_l _vwprintf_p_l
-#define _vftprintf vfwprintf
+#define _vftprintf __ms_vfwprintf
 #define _vftprintf_l _vfwprintf_l
 #define _vftprintf_p _vfwprintf_p
 #define _vftprintf_p_l _vfwprintf_p_l
@@ -178,13 +178,13 @@ extern "C" {
 #define _vsntprintf _vsnwprintf
 #define _vsntprintf_l _vsnwprintf_l
 
-#define _tscanf wscanf
+#define _tscanf __ms_wscanf
 #define _tscanf_l _wscanf_l
 #define _tcscanf _cwscanf
 #define _tcscanf_l _cwscanf_l
-#define _ftscanf fwscanf
+#define _ftscanf __ms_fwscanf
 #define _ftscanf_l _fwscanf_l
-#define _stscanf swscanf
+#define _stscanf __ms_swscanf
 #define _stscanf_l _swscanf_l
 #define _sntscanf _snwscanf
 #define _sntscanf_l _snwscanf_l
@@ -404,6 +404,21 @@ extern "C" {
 
 #define _tsetlocale _wsetlocale
 
+#if __MSVCRT_VERSION__ >= 0x800
+#define _fgettc_nolock _fgetwc_nolock
+#define _fputtc_nolock _fputwc_nolock
+#define _gettc_nolock _getwc_nolock
+#define _gettch_nolock _getwch_nolock
+#define _gettche_nolock _getwche_nolock
+#define _gettchar_nolock _getwchar_nolock
+#define _puttc_nolock _putwc_nolock
+#define _puttchar_nolock _putwchar_nolock
+#define _puttch_nolock _putwch_nolock
+#define _ungettc_nolock _ungetwc_nolock
+#define _ungettch_nolock _ungetwch_nolock
+#define _tgetdcwd_nolock _wgetdcwd_nolock
+#endif
+
 #define _tcsclen wcslen
 #define _tcscnlen wcsnlen
 #define _tcsclen_l(_String,_Locale) wcslen(_String)
@@ -493,7 +508,7 @@ extern "C" {
 
 #endif /* __CYGWIN__ */
 
-#else
+#else /* _UNICODE */
 
 #ifdef __cplusplus
 }
@@ -520,7 +535,7 @@ extern "C" {
 #endif
 #define __targv __argv
 
-#define _tprintf printf
+#define _tprintf __ms_printf
 #define _tprintf_l _printf_l
 #define _tprintf_p _printf_p
 #define _tprintf_p_l _printf_p_l
@@ -532,11 +547,11 @@ extern "C" {
 #define _vtcprintf_l _vcprintf_l
 #define _vtcprintf_p _vcprintf_p
 #define _vtcprintf_p_l _vcprintf_p_l
-#define _ftprintf fprintf
+#define _ftprintf __ms_fprintf
 #define _ftprintf_l _fprintf_l
 #define _ftprintf_p _fprintf_p
 #define _ftprintf_p_l _fprintf_p_l
-#define _stprintf sprintf
+#define _stprintf __ms_sprintf
 #define _stprintf_l _sprintf_l
 #define _stprintf_p _sprintf_p
 #define _stprintf_p_l _sprintf_p_l
@@ -546,15 +561,15 @@ extern "C" {
 #define _sctprintf_p_l _scprintf_p_l
 #define _sntprintf _snprintf
 #define _sntprintf_l _snprintf_l
-#define _vtprintf vprintf
+#define _vtprintf __ms_vprintf
 #define _vtprintf_l _vprintf_l
 #define _vtprintf_p _vprintf_p
 #define _vtprintf_p_l _vprintf_p_l
-#define _vftprintf vfprintf
+#define _vftprintf __ms_vfprintf
 #define _vftprintf_l _vfprintf_l
 #define _vftprintf_p _vfprintf_p
 #define _vftprintf_p_l _vfprintf_p_l
-#define _vstprintf vsprintf
+#define _vstprintf __ms_vsprintf
 #define _vstprintf_l _vsprintf_l
 #define _vstprintf_p _vsprintf_p
 #define _vstprintf_p_l _vsprintf_p_l
@@ -565,13 +580,13 @@ extern "C" {
 #define _vsntprintf _vsnprintf
 #define _vsntprintf_l _vsnprintf_l
 
-#define _tscanf scanf
+#define _tscanf __ms_scanf
 #define _tscanf_l _scanf_l
 #define _tcscanf _cscanf
 #define _tcscanf_l _cscanf_l
-#define _ftscanf fscanf
+#define _ftscanf __ms_fscanf
 #define _ftscanf_l _fscanf_l
-#define _stscanf sscanf
+#define _stscanf __ms_sscanf
 #define _stscanf_l _sscanf_l
 #define _sntscanf _snscanf
 #define _sntscanf_l _snscanf_l
@@ -769,18 +784,6 @@ extern "C" {
 #define _tsetlocale setlocale
 
 #if __MSVCRT_VERSION__ >= 0x800
-#define _fgettc_nolock _fgetwc_nolock
-#define _fputtc_nolock _fputwc_nolock
-#define _gettc_nolock _getwc_nolock
-#define _gettch_nolock _getwch_nolock
-#define _gettche_nolock _getwche_nolock
-#define _gettchar_nolock _getwchar_nolock
-#define _puttc_nolock _putwc_nolock
-#define _puttchar_nolock _putwchar_nolock
-#define _puttch_nolock _putwch_nolock
-#define _ungettc_nolock _ungetwc_nolock
-#define _ungettch_nolock _ungetwch_nolock
-#define _tgetdcwd_nolock _wgetdcwd_nolock
 #define _fgettc_nolock _fgetc_nolock
 #define _fputtc_nolock _fputc_nolock
 #define _gettc_nolock _getc_nolock
@@ -1009,7 +1012,7 @@ extern "C" {
 
 #endif /* __CYGWIN__ */
 
-#else
+#else /* _MBCS */
 
 #ifndef __TCHAR_DEFINED
 #define __TCHAR_DEFINED
@@ -1168,9 +1171,9 @@ extern "C" {
 #define _strnset_l(_Destination,_Value,_Count,_Locale) (_strnset(_Destination,_Value,_Count))
 #define _strset_l(_Destination,_Value,_Locale) (_strset(_Destination,_Value))
 #endif
-#endif
+#endif /* _MBCS */
 
-#endif /* __CYGWIN__ */
+#endif /* _UNICODE */
 
 #define _T(x) __T(x)
 #define _TEXT(x) __T(x)
diff --git a/mingw32/include/wchar.h b/mingw32/include/wchar.h
index 29323a6d95c..ca2c1fc70cb 100644
--- a/mingw32/include/wchar.h
+++ b/mingw32/include/wchar.h
@@ -213,8 +213,9 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index);
   wint_t __cdecl towupper(wint_t _C);
   wint_t __cdecl towlower(wint_t _C);
   int __cdecl iswctype(wint_t _C,wctype_t _Type);
-#if __MSVCRT_VERSION__ >= 0x800 || (__MSVCRT_VERSION__ == 0x700 && _WIN32_WINNT >= 0x0600)
-  /* These are available since msvcr80.dll, and in msvcrt.dll since Vista. */
+#if __MSVCRT_VERSION__ >= 0x800 || (__MSVCRT_VERSION__ == 0x600 && _WIN32_WINNT >= 0x0600)
+  /* These are available since msvcr80.dll (__MSVCRT_VERSION__ >= 0x800), and in
+   * msvcrt.dll (__MSVCRT_VERSION__ == 0x600) since Vista (_WIN32_WINNT >= 0x0600). */
   _CRTIMP int __cdecl _iswalpha_l(wint_t _C,_locale_t _Locale);
   _CRTIMP int __cdecl _iswupper_l(wint_t _C,_locale_t _Locale);
   _CRTIMP int __cdecl _iswlower_l(wint_t _C,_locale_t _Locale);
@@ -253,10 +254,23 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index);
 #ifndef _WDIRECT_DEFINED
 #define _WDIRECT_DEFINED
 
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_wgetcwd")
+#undef _wgetcwd
+#pragma push_macro("_wgetdcwd")
+#undef _wgetdcwd
+#pragma push_macro("_wgetdcwd_nolock")
+#undef _wgetdcwd_nolock
+#endif
   _CRTIMP wchar_t *__cdecl _wgetcwd(wchar_t *_DstBuf,int _SizeInWords);
   _CRTIMP wchar_t *__cdecl _wgetdcwd(int _Drive,wchar_t *_DstBuf,int _SizeInWords);
 #if __MSVCRT_VERSION__ >= 0x800
   wchar_t *__cdecl _wgetdcwd_nolock(int _Drive,wchar_t *_DstBuf,int _SizeInWords);
+#endif
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_wgetcwd")
+#pragma pop_macro("_wgetdcwd")
+#pragma pop_macro("_wgetdcwd_nolock")
 #endif
   _CRTIMP int __cdecl _wchdir(const wchar_t *_Path);
   _CRTIMP int __cdecl _wmkdir(const wchar_t *_Path);
@@ -336,7 +350,7 @@ _CRTIMP FILE *__cdecl __acrt_iob_func(unsigned index);
 #define iswgraph(_c) (iswctype(_c,_PUNCT|_ALPHA|_DIGIT))
 #define iswcntrl(_c) (iswctype(_c,_CONTROL))
 #define iswascii(_c) ((unsigned)(_c) < 0x80)
-#if __MSVCRT_VERSION__ >= 0x800 || (__MSVCRT_VERSION__ == 0x700 && _WIN32_WINNT >= 0x0600)
+#if __MSVCRT_VERSION__ >= 0x800 || (__MSVCRT_VERSION__ == 0x600 && _WIN32_WINNT >= 0x0600)
 # define _iswalpha_l(_c,_p) (_iswctype_l(_c,_ALPHA,_p))
 # define _iswupper_l(_c,_p) (_iswctype_l(_c,_UPPER,_p))
 # define _iswlower_l(_c,_p) (_iswctype_l(_c,_LOWER,_p))
@@ -1117,7 +1131,15 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf);
 #endif
 #endif
 
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_wtempnam")
+#undef _wtempnam
+#endif
   _CRTIMP wchar_t *__cdecl _wtempnam(const wchar_t *_Directory,const wchar_t *_FilePrefix);
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_wtempnam")
+#endif
+
 #ifndef _UCRT
   _CRTIMP int __cdecl _vscwprintf(const wchar_t * __restrict__ _Format,va_list _ArgList);
   _CRTIMP int __cdecl _vscwprintf_l(const wchar_t * __restrict__ _Format,_locale_t _Locale,va_list _ArgList);
@@ -1223,7 +1245,14 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf);
 #ifndef _POSIX_
 #ifndef _WSTDLIBP_DEFINED
 #define _WSTDLIBP_DEFINED
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_wfullpath")
+#undef _wfullpath
+#endif
   _CRTIMP wchar_t *__cdecl _wfullpath(wchar_t *_FullPath,const wchar_t *_Path,size_t _SizeInWords);
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_wfullpath")
+#endif
   _CRTIMP void __cdecl _wmakepath(wchar_t *_ResultPath,const wchar_t *_Drive,const wchar_t *_Dir,const wchar_t *_Filename,const wchar_t *_Ext);
 #ifndef _CRT_WPERROR_DEFINED
 #define _CRT_WPERROR_DEFINED
@@ -1237,7 +1266,14 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf);
 
 #ifndef _WSTRING_DEFINED
 #define _WSTRING_DEFINED
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("_wcsdup")
+#undef _wcsdup
+#endif
   _CRTIMP wchar_t *__cdecl _wcsdup(const wchar_t *_Str);
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("_wcsdup")
+#endif
   wchar_t *__cdecl wcscat(wchar_t * __restrict__ _Dest,const wchar_t * __restrict__ _Source) __MINGW_ATTRIB_DEPRECATED_SEC_WARN;
   _CONST_RETURN wchar_t *__cdecl wcschr(const wchar_t *_Str,wchar_t _Ch);
   int __cdecl wcscmp(const wchar_t *_Str1,const wchar_t *_Str2);
@@ -1286,7 +1322,14 @@ __MINGW_ASM_CALL(__mingw_vsnwprintf);
   _CRTIMP int __cdecl _wcsnicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale);
 
 #ifndef	NO_OLDNAMES
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma push_macro("wcsdup")
+#undef wcsdup
+#endif
   wchar_t *__cdecl wcsdup(const wchar_t *_Str) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
+#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC)
+#pragma pop_macro("wcsdup")
+#endif
 #define wcswcs wcsstr
   int __cdecl wcsicmp(const wchar_t *_Str1,const wchar_t *_Str2) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
   int __cdecl wcsnicmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount) __MINGW_ATTRIB_DEPRECATED_MSVC2005;
diff --git a/mingw32/include/winnt.h b/mingw32/include/winnt.h
index f232ad4a721..b6d1f58ed64 100644
--- a/mingw32/include/winnt.h
+++ b/mingw32/include/winnt.h
@@ -1589,7 +1589,7 @@ __MINGW_CXX14_CONSTEXPR inline ENUMTYPE& operator ^= (ENUMTYPE& a, ENUMTYPE b) {
 
 #ifdef _AMD64_
 
-#if defined(__x86_64) && !defined(RC_INVOKED)
+#if defined(__x86_64) && !defined(__arm64ec__) && !defined(RC_INVOKED)
 
 #ifdef __cplusplus
   extern "C" {
@@ -1789,7 +1789,7 @@ extern "C" {
 #ifdef __cplusplus
   }
 #endif
-#endif /* defined(__x86_64) && !defined(RC_INVOKED) */
+#endif /* defined(__x86_64) && !defined(__arm64ec__) && !defined(RC_INVOKED) */
 
 #define EXCEPTION_READ_FAULT 0
 #define EXCEPTION_WRITE_FAULT 1
@@ -2154,9 +2154,9 @@ extern "C" {
 #endif /* _ARM_ */
 
 
-#ifdef _ARM64_
+#if defined(_ARM64_) || defined(_ARM64EC_)
 
-#if defined(__aarch64__) && !defined(RC_INVOKED)
+#if (defined(__aarch64__) || defined(__arm64ec__)) && !defined(RC_INVOKED)
 
 #ifdef __cplusplus
   extern "C" {
@@ -2226,7 +2226,7 @@ extern "C" {
 #ifdef __cplusplus
   }
 #endif
-#endif /* defined(__aarch64__) && !defined(RC_INVOKED) */
+#endif /* (defined(__aarch64__) || defined(__arm64ec__)) && !defined(RC_INVOKED) */
 
 #define EXCEPTION_READ_FAULT    0
 #define EXCEPTION_WRITE_FAULT   1
@@ -2481,25 +2481,8 @@ __buildmemorybarrier()
 #define PF_TEMPORAL_LEVEL_1
 #define PF_NON_TEMPORAL_LEVEL_ALL
 
-#define PcTeb 0x18
-  struct _TEB *NtCurrentTeb(void);
-  PVOID GetCurrentFiber(void);
-  PVOID GetFiberData(void);
-
 #define DbgRaiseAssertionFailure __int2c
 
-  FORCEINLINE struct _TEB *NtCurrentTeb(void)
-  {
-    return (struct _TEB *)__readfsdword(PcTeb);
-  }
-  FORCEINLINE PVOID GetCurrentFiber(void)
-  {
-    return(PVOID)__readfsdword(0x10);
-  }
-  FORCEINLINE PVOID GetFiberData(void)
-  {
-      return *(PVOID *)GetCurrentFiber();
-  }
 #endif /* defined(__i386__) && !defined(__x86_64) */
 
 #define EXCEPTION_READ_FAULT 0
@@ -2663,8 +2646,6 @@ __buildmemorybarrier()
 #define UnsignedMultiplyHigh __UMULH
 
     ULONGLONG UnsignedMultiplyHigh(ULONGLONG Multiplier,ULONGLONG Multiplicand);
-#else  /* __ia64__ */
-    struct _TEB *NtCurrentTeb(void);
 #endif /* __ia64__ */
 #endif /* !defined(GENUTIL) && !defined(_GENIA64_) && defined(_IA64_) */
 
@@ -9139,7 +9120,7 @@ typedef DWORD (WINAPI *PRTL_RUN_ONCE_INIT_FN)(PRTL_RUN_ONCE, PVOID, PVOID *);
 #if !defined (__CRT__NO_INLINE) && !defined (__WIDL__)
     __CRT_INLINE PVOID WINAPI RtlSecureZeroMemory(PVOID ptr,SIZE_T cnt) {
       volatile char *vptr =(volatile char *)ptr;
-#ifdef __x86_64
+#if defined(__x86_64__) && !defined(__arm64ec__)
       __stosb((PBYTE)((DWORD64)vptr),0,cnt);
 #else
       while(cnt) {
@@ -10224,38 +10205,55 @@ typedef DWORD (WINAPI *PRTL_RUN_ONCE_INIT_FN)(PRTL_RUN_ONCE, PVOID, PVOID *);
     FORCEINLINE VOID TpDestroyCallbackEnviron (PTP_CALLBACK_ENVIRON cbe) { UNREFERENCED_PARAMETER (cbe); }
 #endif
 
-#if defined(__x86_64) && !defined (__WIDL__)
+#if !defined(__ia64__) && !defined (__WIDL__)
     struct _TEB *NtCurrentTeb(VOID);
     PVOID GetCurrentFiber(VOID);
     PVOID GetFiberData(VOID);
-    FORCEINLINE struct _TEB *NtCurrentTeb(VOID) { return (struct _TEB *)__readgsqword(FIELD_OFFSET(NT_TIB,Self)); }
-    FORCEINLINE PVOID GetCurrentFiber(VOID) { return(PVOID)__readgsqword(FIELD_OFFSET(NT_TIB,FiberData)); }
-    FORCEINLINE PVOID GetFiberData(VOID) {
-      return *(PVOID *)GetCurrentFiber();
+
+#if defined (__aarch64__) || defined(__arm64ec__)
+    register struct _TEB *__mingw_current_teb __asm__("x18");
+    FORCEINLINE struct _TEB *NtCurrentTeb(VOID)
+    {
+        return __mingw_current_teb;
     }
-#endif /* __x86_64 */
+    FORCEINLINE PVOID GetCurrentFiber(VOID)
+    {
+        return (PVOID)(((PNT_TIB)NtCurrentTeb())->FiberData);
+    }
+#elif defined(__x86_64__)
+    FORCEINLINE struct _TEB *NtCurrentTeb(VOID)
+    {
+        return (struct _TEB *)__readgsqword(FIELD_OFFSET(NT_TIB,Self));
+    }
+    FORCEINLINE PVOID GetCurrentFiber(VOID)
+    {
+        return (PVOID)__readgsqword(FIELD_OFFSET(NT_TIB,FiberData));
+    }
+#elif defined(__i386__)
+#   define PcTeb 0x18
+    FORCEINLINE struct _TEB *NtCurrentTeb(void)
+    {
+        return (struct _TEB *)__readfsdword(PcTeb);
+    }
+    FORCEINLINE PVOID GetCurrentFiber(void)
+    {
+        return (PVOID)__readfsdword(0x10);
+    }
+#elif defined (__arm__)
+    FORCEINLINE struct _TEB *NtCurrentTeb(VOID)
+    {
+        struct _TEB *teb;
+        __asm ("mrc p15, 0, %0, c13, c0, 2" : "=r" (teb));
+        return teb;
+    }
+    FORCEINLINE PVOID GetCurrentFiber(VOID)
+    {
+        return (PVOID)(((PNT_TIB)NtCurrentTeb())->FiberData);
+    }
+#endif
 
-#if defined (__arm__) && !defined (__WIDL__)
-    struct _TEB *NtCurrentTeb (VOID);
-    PVOID GetCurrentFiber (VOID);
-    PVOID GetFiberData (VOID);
-    FORCEINLINE struct _TEB *NtCurrentTeb(VOID) { struct _TEB *teb;
-    __asm ("mrc p15, 0, %0, c13, c0, 2" : "=r" (teb));
-    return teb; }
-    FORCEINLINE PVOID GetCurrentFiber(VOID) { return (PVOID)(((PNT_TIB)NtCurrentTeb())->FiberData); }
-    FORCEINLINE PVOID GetFiberData (VOID) { return *(PVOID *)GetCurrentFiber (); }
-#endif /* arm */
-
-#if defined (__aarch64__) && !defined (__WIDL__)
-    struct _TEB *NtCurrentTeb (VOID);
-    PVOID GetCurrentFiber (VOID);
-    PVOID GetFiberData (VOID);
-    FORCEINLINE struct _TEB *NtCurrentTeb(VOID) { struct _TEB *teb;
-    __asm ("mov %0, x18" : "=r" (teb));
-    return teb; }
-    FORCEINLINE PVOID GetCurrentFiber(VOID) { return (PVOID)(((PNT_TIB)NtCurrentTeb())->FiberData); }
-    FORCEINLINE PVOID GetFiberData (VOID) { return *(PVOID *)GetCurrentFiber (); }
-#endif /* aarch64 */
+    FORCEINLINE PVOID GetFiberData (VOID) { return *(void **)GetCurrentFiber (); }
+#endif /* !defined(__ia64__) && !defined (__WIDL__) */
 
 #ifndef _NTTMAPI_
 #define _NTTMAPI_
diff --git a/mingw32/lib/crt1.o b/mingw32/lib/crt1.o
index 20cdf15abfc..0d448bdb49d 100644
Binary files a/mingw32/lib/crt1.o and b/mingw32/lib/crt1.o differ
diff --git a/mingw32/lib/crt1u.o b/mingw32/lib/crt1u.o
index 949e59d0c0e..ef1a7b66b87 100644
Binary files a/mingw32/lib/crt1u.o and b/mingw32/lib/crt1u.o differ
diff --git a/mingw32/lib/crt2.o b/mingw32/lib/crt2.o
index 20cdf15abfc..0d448bdb49d 100644
Binary files a/mingw32/lib/crt2.o and b/mingw32/lib/crt2.o differ
diff --git a/mingw32/lib/crt2u.o b/mingw32/lib/crt2u.o
index 949e59d0c0e..ef1a7b66b87 100644
Binary files a/mingw32/lib/crt2u.o and b/mingw32/lib/crt2u.o differ
diff --git a/mingw32/lib/dllcrt1.o b/mingw32/lib/dllcrt1.o
index d417b2fa5f2..abfdbe4a343 100644
Binary files a/mingw32/lib/dllcrt1.o and b/mingw32/lib/dllcrt1.o differ
diff --git a/mingw32/lib/dllcrt2.o b/mingw32/lib/dllcrt2.o
index d417b2fa5f2..abfdbe4a343 100644
Binary files a/mingw32/lib/dllcrt2.o and b/mingw32/lib/dllcrt2.o differ
diff --git a/mingw32/lib/libamstrmid.a b/mingw32/lib/libamstrmid.a
index c9350707bf7..f1d88b98f47 100644
Binary files a/mingw32/lib/libamstrmid.a and b/mingw32/lib/libamstrmid.a differ
diff --git a/mingw32/lib/libbits.a b/mingw32/lib/libbits.a
index a7ca44a2b8e..db71ed9a863 100644
Binary files a/mingw32/lib/libbits.a and b/mingw32/lib/libbits.a differ
diff --git a/mingw32/lib/libcrtdll.a b/mingw32/lib/libcrtdll.a
index 79614ed0807..6b94d0f2e7b 100644
Binary files a/mingw32/lib/libcrtdll.a and b/mingw32/lib/libcrtdll.a differ
diff --git a/mingw32/lib/libdinput.a b/mingw32/lib/libdinput.a
index f6a1d4b460c..1f18120e31d 100644
Binary files a/mingw32/lib/libdinput.a and b/mingw32/lib/libdinput.a differ
diff --git a/mingw32/lib/libdinput8.a b/mingw32/lib/libdinput8.a
index da4463045ae..e8e67f7e218 100644
Binary files a/mingw32/lib/libdinput8.a and b/mingw32/lib/libdinput8.a differ
diff --git a/mingw32/lib/libdloadhelper.a b/mingw32/lib/libdloadhelper.a
index 765b12d0f17..fdaad5e0c5f 100644
Binary files a/mingw32/lib/libdloadhelper.a and b/mingw32/lib/libdloadhelper.a differ
diff --git a/mingw32/lib/libdmoguids.a b/mingw32/lib/libdmoguids.a
index 9b2bd46394b..02d64a5fdee 100644
Binary files a/mingw32/lib/libdmoguids.a and b/mingw32/lib/libdmoguids.a differ
diff --git a/mingw32/lib/libdxerr8.a b/mingw32/lib/libdxerr8.a
index 34ab6770020..8b2d64b8e5d 100644
Binary files a/mingw32/lib/libdxerr8.a and b/mingw32/lib/libdxerr8.a differ
diff --git a/mingw32/lib/libdxerr9.a b/mingw32/lib/libdxerr9.a
index 672326c2685..66faac2d517 100644
Binary files a/mingw32/lib/libdxerr9.a and b/mingw32/lib/libdxerr9.a differ
diff --git a/mingw32/lib/libdxguid.a b/mingw32/lib/libdxguid.a
index 40899982a8c..97d838299e5 100644
Binary files a/mingw32/lib/libdxguid.a and b/mingw32/lib/libdxguid.a differ
diff --git a/mingw32/lib/libgmon.a b/mingw32/lib/libgmon.a
index 49e64ec0024..a22876d5d12 100644
Binary files a/mingw32/lib/libgmon.a and b/mingw32/lib/libgmon.a differ
diff --git a/mingw32/lib/libkernel32.a b/mingw32/lib/libkernel32.a
index eb4df6ed51c..39cd8397300 100644
Binary files a/mingw32/lib/libkernel32.a and b/mingw32/lib/libkernel32.a differ
diff --git a/mingw32/lib/libksguid.a b/mingw32/lib/libksguid.a
index 9acfc1fa906..6f0b2cae925 100644
Binary files a/mingw32/lib/libksguid.a and b/mingw32/lib/libksguid.a differ
diff --git a/mingw32/lib/libksuser.a b/mingw32/lib/libksuser.a
index 263c3fc9baf..3117c2dd5b0 100644
Binary files a/mingw32/lib/libksuser.a and b/mingw32/lib/libksuser.a differ
diff --git a/mingw32/lib/liblocationapi.a b/mingw32/lib/liblocationapi.a
index b02231049de..601d7e9d816 100644
Binary files a/mingw32/lib/liblocationapi.a and b/mingw32/lib/liblocationapi.a differ
diff --git a/mingw32/lib/libmfuuid.a b/mingw32/lib/libmfuuid.a
index 933115d09cd..6d14e1598d5 100644
Binary files a/mingw32/lib/libmfuuid.a and b/mingw32/lib/libmfuuid.a differ
diff --git a/mingw32/lib/libmincore.a b/mingw32/lib/libmincore.a
index a37af0f239a..f13f52fe165 100644
Binary files a/mingw32/lib/libmincore.a and b/mingw32/lib/libmincore.a differ
diff --git a/mingw32/lib/libmingw32.a b/mingw32/lib/libmingw32.a
index ffd40b09d2f..97b123f38d0 100644
Binary files a/mingw32/lib/libmingw32.a and b/mingw32/lib/libmingw32.a differ
diff --git a/mingw32/lib/libmingwex.a b/mingw32/lib/libmingwex.a
index ff6cbe9b821..1aa0a8e3bf3 100644
Binary files a/mingw32/lib/libmingwex.a and b/mingw32/lib/libmingwex.a differ
diff --git a/mingw32/lib/libmsvcr100.a b/mingw32/lib/libmsvcr100.a
index fce7199ab99..d424ff230d1 100644
Binary files a/mingw32/lib/libmsvcr100.a and b/mingw32/lib/libmsvcr100.a differ
diff --git a/mingw32/lib/libmsvcr100d.a b/mingw32/lib/libmsvcr100d.a
index 44528512efc..763a67675b8 100644
Binary files a/mingw32/lib/libmsvcr100d.a and b/mingw32/lib/libmsvcr100d.a differ
diff --git a/mingw32/lib/libmsvcr110.a b/mingw32/lib/libmsvcr110.a
index 56e5c1450c3..b68478fa413 100644
Binary files a/mingw32/lib/libmsvcr110.a and b/mingw32/lib/libmsvcr110.a differ
diff --git a/mingw32/lib/libmsvcr110d.a b/mingw32/lib/libmsvcr110d.a
index a9e0ec89ef5..69f427ad794 100644
Binary files a/mingw32/lib/libmsvcr110d.a and b/mingw32/lib/libmsvcr110d.a differ
diff --git a/mingw32/lib/libmsvcr120.a b/mingw32/lib/libmsvcr120.a
index 8532414dbb1..dc5e13ee5b9 100644
Binary files a/mingw32/lib/libmsvcr120.a and b/mingw32/lib/libmsvcr120.a differ
diff --git a/mingw32/lib/libmsvcr120_app.a b/mingw32/lib/libmsvcr120_app.a
index 035364d671e..d6d7e4f8c53 100644
Binary files a/mingw32/lib/libmsvcr120_app.a and b/mingw32/lib/libmsvcr120_app.a differ
diff --git a/mingw32/lib/libmsvcr120d.a b/mingw32/lib/libmsvcr120d.a
index fe5eb8bdc5c..2c10e5ea2e7 100644
Binary files a/mingw32/lib/libmsvcr120d.a and b/mingw32/lib/libmsvcr120d.a differ
diff --git a/mingw32/lib/libmsvcr40d.a b/mingw32/lib/libmsvcr40d.a
index 4eed6ab11f8..56c21edf123 100644
Binary files a/mingw32/lib/libmsvcr40d.a and b/mingw32/lib/libmsvcr40d.a differ
diff --git a/mingw32/lib/libmsvcr70.a b/mingw32/lib/libmsvcr70.a
index e612458ac77..cfdb473e14e 100644
Binary files a/mingw32/lib/libmsvcr70.a and b/mingw32/lib/libmsvcr70.a differ
diff --git a/mingw32/lib/libmsvcr70d.a b/mingw32/lib/libmsvcr70d.a
index 936a0ea51bd..9be546e880c 100644
Binary files a/mingw32/lib/libmsvcr70d.a and b/mingw32/lib/libmsvcr70d.a differ
diff --git a/mingw32/lib/libmsvcr71.a b/mingw32/lib/libmsvcr71.a
index 94822e4dbaa..dd60606524b 100644
Binary files a/mingw32/lib/libmsvcr71.a and b/mingw32/lib/libmsvcr71.a differ
diff --git a/mingw32/lib/libmsvcr71d.a b/mingw32/lib/libmsvcr71d.a
index 411b6ef560e..38e101aa8ec 100644
Binary files a/mingw32/lib/libmsvcr71d.a and b/mingw32/lib/libmsvcr71d.a differ
diff --git a/mingw32/lib/libmsvcr80.a b/mingw32/lib/libmsvcr80.a
index 2752e167319..5ec5d6e3640 100644
Binary files a/mingw32/lib/libmsvcr80.a and b/mingw32/lib/libmsvcr80.a differ
diff --git a/mingw32/lib/libmsvcr80d.a b/mingw32/lib/libmsvcr80d.a
index a0cf51c7e01..5ebb41f0dad 100644
Binary files a/mingw32/lib/libmsvcr80d.a and b/mingw32/lib/libmsvcr80d.a differ
diff --git a/mingw32/lib/libmsvcr90.a b/mingw32/lib/libmsvcr90.a
index 0ec63b35e8f..852fbb31176 100644
Binary files a/mingw32/lib/libmsvcr90.a and b/mingw32/lib/libmsvcr90.a differ
diff --git a/mingw32/lib/libmsvcr90d.a b/mingw32/lib/libmsvcr90d.a
index f2ffb3eb816..b9a62585964 100644
Binary files a/mingw32/lib/libmsvcr90d.a and b/mingw32/lib/libmsvcr90d.a differ
diff --git a/mingw32/lib/libmsvcrt-os.a b/mingw32/lib/libmsvcrt-os.a
index 6bc0697e2b6..843b8da4fc1 100644
Binary files a/mingw32/lib/libmsvcrt-os.a and b/mingw32/lib/libmsvcrt-os.a differ
diff --git a/mingw32/lib/libmsvcrt.a b/mingw32/lib/libmsvcrt.a
index 6bc0697e2b6..843b8da4fc1 100644
Binary files a/mingw32/lib/libmsvcrt.a and b/mingw32/lib/libmsvcrt.a differ
diff --git a/mingw32/lib/libmsvcrt10.a b/mingw32/lib/libmsvcrt10.a
index 58d2cdb4680..37deaa9d506 100644
Binary files a/mingw32/lib/libmsvcrt10.a and b/mingw32/lib/libmsvcrt10.a differ
diff --git a/mingw32/lib/libmsvcrt20.a b/mingw32/lib/libmsvcrt20.a
index fd6cfe67fb4..0e78cc50051 100644
Binary files a/mingw32/lib/libmsvcrt20.a and b/mingw32/lib/libmsvcrt20.a differ
diff --git a/mingw32/lib/libmsvcrt40.a b/mingw32/lib/libmsvcrt40.a
index 2293b7c71c0..01688fe9cc2 100644
Binary files a/mingw32/lib/libmsvcrt40.a and b/mingw32/lib/libmsvcrt40.a differ
diff --git a/mingw32/lib/libmsvcrtd.a b/mingw32/lib/libmsvcrtd.a
index 4f7ca406698..081917a56e4 100644
Binary files a/mingw32/lib/libmsvcrtd.a and b/mingw32/lib/libmsvcrtd.a differ
diff --git a/mingw32/lib/libmsxml2.a b/mingw32/lib/libmsxml2.a
index f8de8f18baf..3e7cfb1c8e9 100644
Binary files a/mingw32/lib/libmsxml2.a and b/mingw32/lib/libmsxml2.a differ
diff --git a/mingw32/lib/libmsxml6.a b/mingw32/lib/libmsxml6.a
index e53860f3292..03039237ada 100644
Binary files a/mingw32/lib/libmsxml6.a and b/mingw32/lib/libmsxml6.a differ
diff --git a/mingw32/lib/libonecore.a b/mingw32/lib/libonecore.a
index 4c4def53f6b..ba7f109c822 100644
Binary files a/mingw32/lib/libonecore.a and b/mingw32/lib/libonecore.a differ
diff --git a/mingw32/lib/libonecore_apiset.a b/mingw32/lib/libonecore_apiset.a
index 1f141eedf7a..b3bc0166c9c 100644
Binary files a/mingw32/lib/libonecore_apiset.a and b/mingw32/lib/libonecore_apiset.a differ
diff --git a/mingw32/lib/libonecoreuap_apiset.a b/mingw32/lib/libonecoreuap_apiset.a
index 4d2c048bc05..43d4f635774 100644
Binary files a/mingw32/lib/libonecoreuap_apiset.a and b/mingw32/lib/libonecoreuap_apiset.a differ
diff --git a/mingw32/lib/libportabledeviceguids.a b/mingw32/lib/libportabledeviceguids.a
index 915658ad9e0..32235f60cbc 100644
Binary files a/mingw32/lib/libportabledeviceguids.a and b/mingw32/lib/libportabledeviceguids.a differ
diff --git a/mingw32/lib/libsapi.a b/mingw32/lib/libsapi.a
index b65453b6c66..6fbd5062f31 100644
Binary files a/mingw32/lib/libsapi.a and b/mingw32/lib/libsapi.a differ
diff --git a/mingw32/lib/libscrnsave.a b/mingw32/lib/libscrnsave.a
index daa0a7bba42..8e6f324cf37 100644
Binary files a/mingw32/lib/libscrnsave.a and b/mingw32/lib/libscrnsave.a differ
diff --git a/mingw32/lib/libscrnsavw.a b/mingw32/lib/libscrnsavw.a
index 422802502d8..dae4beaf752 100644
Binary files a/mingw32/lib/libscrnsavw.a and b/mingw32/lib/libscrnsavw.a differ
diff --git a/mingw32/lib/libsensorsapi.a b/mingw32/lib/libsensorsapi.a
index ee93fd4e941..8a35511b36c 100644
Binary files a/mingw32/lib/libsensorsapi.a and b/mingw32/lib/libsensorsapi.a differ
diff --git a/mingw32/lib/libstrmiids.a b/mingw32/lib/libstrmiids.a
index b702aa34e72..e703ece8efe 100644
Binary files a/mingw32/lib/libstrmiids.a and b/mingw32/lib/libstrmiids.a differ
diff --git a/mingw32/lib/libtaskschd.a b/mingw32/lib/libtaskschd.a
index bc397d429ff..a1d0558dabf 100644
Binary files a/mingw32/lib/libtaskschd.a and b/mingw32/lib/libtaskschd.a differ
diff --git a/mingw32/lib/libucrt.a b/mingw32/lib/libucrt.a
index a01ac3365f8..eb07e2f32f2 100644
Binary files a/mingw32/lib/libucrt.a and b/mingw32/lib/libucrt.a differ
diff --git a/mingw32/lib/libucrtapp.a b/mingw32/lib/libucrtapp.a
index 571a21f0fe1..579be5e76a6 100644
Binary files a/mingw32/lib/libucrtapp.a and b/mingw32/lib/libucrtapp.a differ
diff --git a/mingw32/lib/libucrtbase.a b/mingw32/lib/libucrtbase.a
index 4c8cbff6903..72e0b836643 100644
Binary files a/mingw32/lib/libucrtbase.a and b/mingw32/lib/libucrtbase.a differ
diff --git a/mingw32/lib/libucrtbased.a b/mingw32/lib/libucrtbased.a
index 81520635466..9f3026ebdb4 100644
Binary files a/mingw32/lib/libucrtbased.a and b/mingw32/lib/libucrtbased.a differ
diff --git a/mingw32/lib/libuuid.a b/mingw32/lib/libuuid.a
index dcce7f6e8d3..a92142552f1 100644
Binary files a/mingw32/lib/libuuid.a and b/mingw32/lib/libuuid.a differ
diff --git a/mingw32/lib/libwbemuuid.a b/mingw32/lib/libwbemuuid.a
index fa837fbafba..4813434a186 100644
Binary files a/mingw32/lib/libwbemuuid.a and b/mingw32/lib/libwbemuuid.a differ
diff --git a/mingw32/lib/libwindowscodecs.a b/mingw32/lib/libwindowscodecs.a
index b58fc200bc1..b1f126c37f6 100644
Binary files a/mingw32/lib/libwindowscodecs.a and b/mingw32/lib/libwindowscodecs.a differ
diff --git a/mingw32/lib/libwindowscoreheadless_apiset.a b/mingw32/lib/libwindowscoreheadless_apiset.a
index 621b49c2e10..e0a76f8b739 100644
Binary files a/mingw32/lib/libwindowscoreheadless_apiset.a and b/mingw32/lib/libwindowscoreheadless_apiset.a differ
diff --git a/mingw32/lib/libwmcodecdspuuid.a b/mingw32/lib/libwmcodecdspuuid.a
index 08ad2b7a392..474c8208d75 100644
Binary files a/mingw32/lib/libwmcodecdspuuid.a and b/mingw32/lib/libwmcodecdspuuid.a differ
diff --git a/mingw32/lib/libws2_32.a b/mingw32/lib/libws2_32.a
index a40884ef7b7..dda586a219a 100644
Binary files a/mingw32/lib/libws2_32.a and b/mingw32/lib/libws2_32.a differ
diff --git a/var/lib/pacman/local/mingw-w64-i686-crt-git-12.0.0.r446.ga2d19218d-1/mtree b/var/lib/pacman/local/mingw-w64-i686-crt-git-12.0.0.r446.ga2d19218d-1/mtree
deleted file mode 100644
index 64ade88b5f4..00000000000
Binary files a/var/lib/pacman/local/mingw-w64-i686-crt-git-12.0.0.r446.ga2d19218d-1/mtree and /dev/null differ
diff --git a/var/lib/pacman/local/mingw-w64-i686-crt-git-12.0.0.r446.ga2d19218d-1/desc b/var/lib/pacman/local/mingw-w64-i686-crt-git-12.0.0.r458.g03d8a40f5-1/desc
similarity index 78%
rename from var/lib/pacman/local/mingw-w64-i686-crt-git-12.0.0.r446.ga2d19218d-1/desc
rename to var/lib/pacman/local/mingw-w64-i686-crt-git-12.0.0.r458.g03d8a40f5-1/desc
index 8f1d19d2481..7321f3390d4 100644
--- a/var/lib/pacman/local/mingw-w64-i686-crt-git-12.0.0.r446.ga2d19218d-1/desc
+++ b/var/lib/pacman/local/mingw-w64-i686-crt-git-12.0.0.r458.g03d8a40f5-1/desc
@@ -2,7 +2,7 @@
 mingw-w64-i686-crt-git
 
 %VERSION%
-12.0.0.r446.ga2d19218d-1
+12.0.0.r458.g03d8a40f5-1
 
 %BASE%
 mingw-w64-crt-git
@@ -17,16 +17,16 @@ https://www.mingw-w64.org/
 any
 
 %BUILDDATE%
-1734034516
+1735221762
 
 %INSTALLDATE%
-1734146980
+1735269624
 
 %PACKAGER%
-CI (msys2/msys2-autobuild/0f71ee73/12303981808)
+CI (msys2/msys2-autobuild/35ff0b71/12504687999)
 
 %SIZE%
-128444877
+128459055
 
 %GROUPS%
 mingw-w64-i686-toolchain
diff --git a/var/lib/pacman/local/mingw-w64-i686-crt-git-12.0.0.r446.ga2d19218d-1/files b/var/lib/pacman/local/mingw-w64-i686-crt-git-12.0.0.r458.g03d8a40f5-1/files
similarity index 100%
rename from var/lib/pacman/local/mingw-w64-i686-crt-git-12.0.0.r446.ga2d19218d-1/files
rename to var/lib/pacman/local/mingw-w64-i686-crt-git-12.0.0.r458.g03d8a40f5-1/files
diff --git a/var/lib/pacman/local/mingw-w64-i686-crt-git-12.0.0.r458.g03d8a40f5-1/mtree b/var/lib/pacman/local/mingw-w64-i686-crt-git-12.0.0.r458.g03d8a40f5-1/mtree
new file mode 100644
index 00000000000..47a75bd31b8
Binary files /dev/null and b/var/lib/pacman/local/mingw-w64-i686-crt-git-12.0.0.r458.g03d8a40f5-1/mtree differ
diff --git a/var/lib/pacman/local/mingw-w64-i686-git-extra-1.1.641.031e03baf-1/desc b/var/lib/pacman/local/mingw-w64-i686-git-extra-1.1.641.031e03baf-1/desc
index 7e3d91e1f52..8bd55ed1e4e 100644
--- a/var/lib/pacman/local/mingw-w64-i686-git-extra-1.1.641.031e03baf-1/desc
+++ b/var/lib/pacman/local/mingw-w64-i686-git-extra-1.1.641.031e03baf-1/desc
@@ -20,7 +20,7 @@ any
 1718204230
 
 %INSTALLDATE%
-1735096771
+1735269627
 
 %PACKAGER%
 Johannes Schindelin <johannes.schindelin@gmx.de>
diff --git a/var/lib/pacman/local/mingw-w64-i686-headers-git-12.0.0.r446.ga2d19218d-2/mtree b/var/lib/pacman/local/mingw-w64-i686-headers-git-12.0.0.r446.ga2d19218d-2/mtree
deleted file mode 100644
index dd36cc56e14..00000000000
Binary files a/var/lib/pacman/local/mingw-w64-i686-headers-git-12.0.0.r446.ga2d19218d-2/mtree and /dev/null differ
diff --git a/var/lib/pacman/local/mingw-w64-i686-headers-git-12.0.0.r446.ga2d19218d-2/desc b/var/lib/pacman/local/mingw-w64-i686-headers-git-12.0.0.r458.g03d8a40f5-1/desc
similarity index 79%
rename from var/lib/pacman/local/mingw-w64-i686-headers-git-12.0.0.r446.ga2d19218d-2/desc
rename to var/lib/pacman/local/mingw-w64-i686-headers-git-12.0.0.r458.g03d8a40f5-1/desc
index c1cb4f6402b..207d653ce26 100644
--- a/var/lib/pacman/local/mingw-w64-i686-headers-git-12.0.0.r446.ga2d19218d-2/desc
+++ b/var/lib/pacman/local/mingw-w64-i686-headers-git-12.0.0.r458.g03d8a40f5-1/desc
@@ -2,7 +2,7 @@
 mingw-w64-i686-headers-git
 
 %VERSION%
-12.0.0.r446.ga2d19218d-2
+12.0.0.r458.g03d8a40f5-1
 
 %BASE%
 mingw-w64-headers-git
@@ -17,16 +17,16 @@ https://www.mingw-w64.org/
 any
 
 %BUILDDATE%
-1734251873
+1735221608
 
 %INSTALLDATE%
-1734320214
+1735269623
 
 %PACKAGER%
-CI (msys2/msys2-autobuild/0f20d6bf/12337276938)
+CI (msys2/msys2-autobuild/35ff0b71/12504687999)
 
 %SIZE%
-90352503
+90374998
 
 %GROUPS%
 mingw-w64-i686-toolchain
diff --git a/var/lib/pacman/local/mingw-w64-i686-headers-git-12.0.0.r446.ga2d19218d-2/files b/var/lib/pacman/local/mingw-w64-i686-headers-git-12.0.0.r458.g03d8a40f5-1/files
similarity index 100%
rename from var/lib/pacman/local/mingw-w64-i686-headers-git-12.0.0.r446.ga2d19218d-2/files
rename to var/lib/pacman/local/mingw-w64-i686-headers-git-12.0.0.r458.g03d8a40f5-1/files
diff --git a/var/lib/pacman/local/mingw-w64-i686-headers-git-12.0.0.r458.g03d8a40f5-1/mtree b/var/lib/pacman/local/mingw-w64-i686-headers-git-12.0.0.r458.g03d8a40f5-1/mtree
new file mode 100644
index 00000000000..b4f9bae18c8
Binary files /dev/null and b/var/lib/pacman/local/mingw-w64-i686-headers-git-12.0.0.r458.g03d8a40f5-1/mtree differ
diff --git a/var/lib/pacman/local/mingw-w64-i686-libmangle-git-12.0.0.r446.ga2d19218d-1/mtree b/var/lib/pacman/local/mingw-w64-i686-libmangle-git-12.0.0.r446.ga2d19218d-1/mtree
deleted file mode 100644
index 3e77eb8f305..00000000000
Binary files a/var/lib/pacman/local/mingw-w64-i686-libmangle-git-12.0.0.r446.ga2d19218d-1/mtree and /dev/null differ
diff --git a/var/lib/pacman/local/mingw-w64-i686-libmangle-git-12.0.0.r446.ga2d19218d-1/desc b/var/lib/pacman/local/mingw-w64-i686-libmangle-git-12.0.0.r458.g03d8a40f5-1/desc
similarity index 79%
rename from var/lib/pacman/local/mingw-w64-i686-libmangle-git-12.0.0.r446.ga2d19218d-1/desc
rename to var/lib/pacman/local/mingw-w64-i686-libmangle-git-12.0.0.r458.g03d8a40f5-1/desc
index 314dc580050..ee00ade3380 100644
--- a/var/lib/pacman/local/mingw-w64-i686-libmangle-git-12.0.0.r446.ga2d19218d-1/desc
+++ b/var/lib/pacman/local/mingw-w64-i686-libmangle-git-12.0.0.r458.g03d8a40f5-1/desc
@@ -2,7 +2,7 @@
 mingw-w64-i686-libmangle-git
 
 %VERSION%
-12.0.0.r446.ga2d19218d-1
+12.0.0.r458.g03d8a40f5-1
 
 %BASE%
 mingw-w64-libmangle-git
@@ -17,13 +17,13 @@ https://www.mingw-w64.org/
 any
 
 %BUILDDATE%
-1734035044
+1735222375
 
 %INSTALLDATE%
-1734146980
+1735269624
 
 %PACKAGER%
-CI (msys2/msys2-autobuild/0f71ee73/12303981808)
+CI (msys2/msys2-autobuild/35ff0b71/12504687999)
 
 %SIZE%
 52797
diff --git a/var/lib/pacman/local/mingw-w64-i686-libmangle-git-12.0.0.r446.ga2d19218d-1/files b/var/lib/pacman/local/mingw-w64-i686-libmangle-git-12.0.0.r458.g03d8a40f5-1/files
similarity index 100%
rename from var/lib/pacman/local/mingw-w64-i686-libmangle-git-12.0.0.r446.ga2d19218d-1/files
rename to var/lib/pacman/local/mingw-w64-i686-libmangle-git-12.0.0.r458.g03d8a40f5-1/files
diff --git a/var/lib/pacman/local/mingw-w64-i686-libmangle-git-12.0.0.r458.g03d8a40f5-1/mtree b/var/lib/pacman/local/mingw-w64-i686-libmangle-git-12.0.0.r458.g03d8a40f5-1/mtree
new file mode 100644
index 00000000000..433d000adcc
Binary files /dev/null and b/var/lib/pacman/local/mingw-w64-i686-libmangle-git-12.0.0.r458.g03d8a40f5-1/mtree differ
diff --git a/var/lib/pacman/local/mingw-w64-i686-libwinpthread-git-12.0.0.r446.ga2d19218d-1/mtree b/var/lib/pacman/local/mingw-w64-i686-libwinpthread-git-12.0.0.r446.ga2d19218d-1/mtree
deleted file mode 100644
index 9bcb35dccc2..00000000000
Binary files a/var/lib/pacman/local/mingw-w64-i686-libwinpthread-git-12.0.0.r446.ga2d19218d-1/mtree and /dev/null differ
diff --git a/var/lib/pacman/local/mingw-w64-i686-libwinpthread-git-12.0.0.r446.ga2d19218d-1/desc b/var/lib/pacman/local/mingw-w64-i686-libwinpthread-git-12.0.0.r458.g03d8a40f5-1/desc
similarity index 81%
rename from var/lib/pacman/local/mingw-w64-i686-libwinpthread-git-12.0.0.r446.ga2d19218d-1/desc
rename to var/lib/pacman/local/mingw-w64-i686-libwinpthread-git-12.0.0.r458.g03d8a40f5-1/desc
index 142b2e11f6d..026cac74da3 100644
--- a/var/lib/pacman/local/mingw-w64-i686-libwinpthread-git-12.0.0.r446.ga2d19218d-1/desc
+++ b/var/lib/pacman/local/mingw-w64-i686-libwinpthread-git-12.0.0.r458.g03d8a40f5-1/desc
@@ -2,7 +2,7 @@
 mingw-w64-i686-libwinpthread-git
 
 %VERSION%
-12.0.0.r446.ga2d19218d-1
+12.0.0.r458.g03d8a40f5-1
 
 %BASE%
 mingw-w64-winpthreads-git
@@ -17,13 +17,13 @@ https://www.mingw-w64.org/
 any
 
 %BUILDDATE%
-1734034917
+1735222227
 
 %INSTALLDATE%
-1734146980
+1735269624
 
 %PACKAGER%
-CI (msys2/msys2-autobuild/0f71ee73/12303981808)
+CI (msys2/msys2-autobuild/35ff0b71/12504687999)
 
 %SIZE%
 75674
diff --git a/var/lib/pacman/local/mingw-w64-i686-libwinpthread-git-12.0.0.r446.ga2d19218d-1/files b/var/lib/pacman/local/mingw-w64-i686-libwinpthread-git-12.0.0.r458.g03d8a40f5-1/files
similarity index 100%
rename from var/lib/pacman/local/mingw-w64-i686-libwinpthread-git-12.0.0.r446.ga2d19218d-1/files
rename to var/lib/pacman/local/mingw-w64-i686-libwinpthread-git-12.0.0.r458.g03d8a40f5-1/files
diff --git a/var/lib/pacman/local/mingw-w64-i686-libwinpthread-git-12.0.0.r458.g03d8a40f5-1/mtree b/var/lib/pacman/local/mingw-w64-i686-libwinpthread-git-12.0.0.r458.g03d8a40f5-1/mtree
new file mode 100644
index 00000000000..30167e36ab7
Binary files /dev/null and b/var/lib/pacman/local/mingw-w64-i686-libwinpthread-git-12.0.0.r458.g03d8a40f5-1/mtree differ
diff --git a/var/lib/pacman/local/mingw-w64-i686-tools-git-12.0.0.r446.ga2d19218d-1/mtree b/var/lib/pacman/local/mingw-w64-i686-tools-git-12.0.0.r446.ga2d19218d-1/mtree
deleted file mode 100644
index f78a6ee3e3a..00000000000
Binary files a/var/lib/pacman/local/mingw-w64-i686-tools-git-12.0.0.r446.ga2d19218d-1/mtree and /dev/null differ
diff --git a/var/lib/pacman/local/mingw-w64-i686-tools-git-12.0.0.r446.ga2d19218d-1/desc b/var/lib/pacman/local/mingw-w64-i686-tools-git-12.0.0.r458.g03d8a40f5-1/desc
similarity index 81%
rename from var/lib/pacman/local/mingw-w64-i686-tools-git-12.0.0.r446.ga2d19218d-1/desc
rename to var/lib/pacman/local/mingw-w64-i686-tools-git-12.0.0.r458.g03d8a40f5-1/desc
index e53f2ee2883..9fff3affb9a 100644
--- a/var/lib/pacman/local/mingw-w64-i686-tools-git-12.0.0.r446.ga2d19218d-1/desc
+++ b/var/lib/pacman/local/mingw-w64-i686-tools-git-12.0.0.r458.g03d8a40f5-1/desc
@@ -2,7 +2,7 @@
 mingw-w64-i686-tools-git
 
 %VERSION%
-12.0.0.r446.ga2d19218d-1
+12.0.0.r458.g03d8a40f5-1
 
 %BASE%
 mingw-w64-tools-git
@@ -17,13 +17,13 @@ https://www.mingw-w64.org/
 any
 
 %BUILDDATE%
-1734035144
+1735222479
 
 %INSTALLDATE%
-1734146980
+1735269624
 
 %PACKAGER%
-CI (msys2/msys2-autobuild/0f71ee73/12303981808)
+CI (msys2/msys2-autobuild/35ff0b71/12504687999)
 
 %SIZE%
 1055527
diff --git a/var/lib/pacman/local/mingw-w64-i686-tools-git-12.0.0.r446.ga2d19218d-1/files b/var/lib/pacman/local/mingw-w64-i686-tools-git-12.0.0.r458.g03d8a40f5-1/files
similarity index 100%
rename from var/lib/pacman/local/mingw-w64-i686-tools-git-12.0.0.r446.ga2d19218d-1/files
rename to var/lib/pacman/local/mingw-w64-i686-tools-git-12.0.0.r458.g03d8a40f5-1/files
diff --git a/var/lib/pacman/local/mingw-w64-i686-tools-git-12.0.0.r458.g03d8a40f5-1/mtree b/var/lib/pacman/local/mingw-w64-i686-tools-git-12.0.0.r458.g03d8a40f5-1/mtree
new file mode 100644
index 00000000000..29fc378c05f
Binary files /dev/null and b/var/lib/pacman/local/mingw-w64-i686-tools-git-12.0.0.r458.g03d8a40f5-1/mtree differ
diff --git a/var/lib/pacman/local/mingw-w64-i686-winpthreads-git-12.0.0.r446.ga2d19218d-1/mtree b/var/lib/pacman/local/mingw-w64-i686-winpthreads-git-12.0.0.r446.ga2d19218d-1/mtree
deleted file mode 100644
index 828395024ef..00000000000
Binary files a/var/lib/pacman/local/mingw-w64-i686-winpthreads-git-12.0.0.r446.ga2d19218d-1/mtree and /dev/null differ
diff --git a/var/lib/pacman/local/mingw-w64-i686-winpthreads-git-12.0.0.r446.ga2d19218d-1/desc b/var/lib/pacman/local/mingw-w64-i686-winpthreads-git-12.0.0.r458.g03d8a40f5-1/desc
similarity index 74%
rename from var/lib/pacman/local/mingw-w64-i686-winpthreads-git-12.0.0.r446.ga2d19218d-1/desc
rename to var/lib/pacman/local/mingw-w64-i686-winpthreads-git-12.0.0.r458.g03d8a40f5-1/desc
index a3ebc6f1845..9035e7e39e6 100644
--- a/var/lib/pacman/local/mingw-w64-i686-winpthreads-git-12.0.0.r446.ga2d19218d-1/desc
+++ b/var/lib/pacman/local/mingw-w64-i686-winpthreads-git-12.0.0.r458.g03d8a40f5-1/desc
@@ -2,7 +2,7 @@
 mingw-w64-i686-winpthreads-git
 
 %VERSION%
-12.0.0.r446.ga2d19218d-1
+12.0.0.r458.g03d8a40f5-1
 
 %BASE%
 mingw-w64-winpthreads-git
@@ -17,13 +17,13 @@ https://www.mingw-w64.org/
 any
 
 %BUILDDATE%
-1734034917
+1735222227
 
 %INSTALLDATE%
-1734146980
+1735269624
 
 %PACKAGER%
-CI (msys2/msys2-autobuild/0f71ee73/12303981808)
+CI (msys2/msys2-autobuild/35ff0b71/12504687999)
 
 %SIZE%
 416013
@@ -40,7 +40,7 @@ pgp
 
 %DEPENDS%
 mingw-w64-i686-crt-git
-mingw-w64-i686-libwinpthread-git=12.0.0.r446.ga2d19218d
+mingw-w64-i686-libwinpthread-git=12.0.0.r458.g03d8a40f5
 
 %CONFLICTS%
 mingw-w64-i686-winpthreads
diff --git a/var/lib/pacman/local/mingw-w64-i686-winpthreads-git-12.0.0.r446.ga2d19218d-1/files b/var/lib/pacman/local/mingw-w64-i686-winpthreads-git-12.0.0.r458.g03d8a40f5-1/files
similarity index 100%
rename from var/lib/pacman/local/mingw-w64-i686-winpthreads-git-12.0.0.r446.ga2d19218d-1/files
rename to var/lib/pacman/local/mingw-w64-i686-winpthreads-git-12.0.0.r458.g03d8a40f5-1/files
diff --git a/var/lib/pacman/local/mingw-w64-i686-winpthreads-git-12.0.0.r458.g03d8a40f5-1/mtree b/var/lib/pacman/local/mingw-w64-i686-winpthreads-git-12.0.0.r458.g03d8a40f5-1/mtree
new file mode 100644
index 00000000000..bfbe9317bb8
Binary files /dev/null and b/var/lib/pacman/local/mingw-w64-i686-winpthreads-git-12.0.0.r458.g03d8a40f5-1/mtree differ
diff --git a/var/lib/pacman/sync/clang64.db b/var/lib/pacman/sync/clang64.db
index b10ee46dd5a..a9f11d45130 100644
Binary files a/var/lib/pacman/sync/clang64.db and b/var/lib/pacman/sync/clang64.db differ
diff --git a/var/lib/pacman/sync/clang64.db.sig b/var/lib/pacman/sync/clang64.db.sig
index 1f7d839615e..50b5e7bef8d 100644
Binary files a/var/lib/pacman/sync/clang64.db.sig and b/var/lib/pacman/sync/clang64.db.sig differ
diff --git a/var/lib/pacman/sync/mingw32.db b/var/lib/pacman/sync/mingw32.db
index b26a850167a..1babc54a2b6 100644
Binary files a/var/lib/pacman/sync/mingw32.db and b/var/lib/pacman/sync/mingw32.db differ
diff --git a/var/lib/pacman/sync/mingw32.db.sig b/var/lib/pacman/sync/mingw32.db.sig
index ddd48ad0370..82ec7c9a78f 100644
Binary files a/var/lib/pacman/sync/mingw32.db.sig and b/var/lib/pacman/sync/mingw32.db.sig differ
diff --git a/var/lib/pacman/sync/mingw64.db b/var/lib/pacman/sync/mingw64.db
index 7c3d4b02d0d..9bf91f30186 100644
Binary files a/var/lib/pacman/sync/mingw64.db and b/var/lib/pacman/sync/mingw64.db differ
diff --git a/var/lib/pacman/sync/mingw64.db.sig b/var/lib/pacman/sync/mingw64.db.sig
index ee68385037f..ca60e754c01 100644
Binary files a/var/lib/pacman/sync/mingw64.db.sig and b/var/lib/pacman/sync/mingw64.db.sig differ
diff --git a/var/lib/pacman/sync/ucrt64.db b/var/lib/pacman/sync/ucrt64.db
index b0b95ed351f..468295301e6 100644
Binary files a/var/lib/pacman/sync/ucrt64.db and b/var/lib/pacman/sync/ucrt64.db differ
diff --git a/var/lib/pacman/sync/ucrt64.db.sig b/var/lib/pacman/sync/ucrt64.db.sig
index 161db28203a..b1cb7b6cd1d 100644
Binary files a/var/lib/pacman/sync/ucrt64.db.sig and b/var/lib/pacman/sync/ucrt64.db.sig differ