mingw: Update MinGW-w64 sources to 3839e21b08807479a31d5a9764666f82ae2f0356.

Author: alexrp

lib/libc/mingw/crt/cinitexe.c

@@ -1,13 +1,12 @@
 #include <stdio.h>
 #include <sect_attribs.h>
+#include <corecrt_startup.h>
 
 #ifdef _MSC_VER
 #pragma comment(linker, "/merge:.CRT=.rdata")
 #endif
 
-typedef void (__cdecl *_PVFV)(void);
-
-_CRTALLOC(".CRT$XIA") _PVFV __xi_a[] = { NULL };
-_CRTALLOC(".CRT$XIZ") _PVFV __xi_z[] = { NULL };
+_CRTALLOC(".CRT$XIA") _PIFV __xi_a[] = { NULL };
+_CRTALLOC(".CRT$XIZ") _PIFV __xi_z[] = { NULL };
 _CRTALLOC(".CRT$XCA") _PVFV __xc_a[] = { NULL };
 _CRTALLOC(".CRT$XCZ") _PVFV __xc_z[] = { NULL };

lib/libc/mingw/crt/crt_handler.c

@@ -51,10 +51,6 @@ __mingw_init_ehandler (void)
   if (_FindPESectionByName (".pdata") != NULL)
     return 1;
 
-  /* Allocate # of e tables and entries.  */
-  memset (emu_pdata, 0, sizeof (RUNTIME_FUNCTION) * MAX_PDATA_ENTRIES);
-  memset (emu_xdata, 0, sizeof (UNWIND_INFO) * MAX_PDATA_ENTRIES);
-    
   e = 0;
   /* Fill tables and entries.  */
   while (e < MAX_PDATA_ENTRIES && (pSec = _FindPESectionExec (e)) != NULL)

lib/libc/mingw/crt/crtdll.c

@@ -97,7 +97,8 @@ WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
 	{
 	  __native_startup_state = __initializing;
 
-	  _initterm ((_PVFV *) (void *) __xi_a, (_PVFV *) (void *) __xi_z);
+	  if (_initterm_e (__xi_a, __xi_z) != 0)
+	    return FALSE;
 	}
       if (__native_startup_state == __initializing)
 	{
@@ -147,15 +148,15 @@ WINBOOL WINAPI
 DllMainCRTStartup (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
 {
   __mingw_app_type = 0;
-  if (dwReason == DLL_PROCESS_ATTACH)
-    {
-#if defined(__x86_64__) && !defined(__SEH__)
-      __mingw_init_ehandler ();
-#endif
-    }
   return __DllMainCRTStartup (hDllHandle, dwReason, lpreserved);
 }
 
+static
+#if defined(__i386__) || defined(_X86_)
+/* We need to make sure that we align the stack to 16 bytes for the sake of SSE
+   opts in DllMain/DllEntryPoint or in functions called from DllMain/DllEntryPoint.  */
+__attribute__((force_align_arg_pointer))
+#endif
 __declspec(noinline) WINBOOL
 __DllMainCRTStartup (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
 {
@@ -168,6 +169,12 @@ __DllMainCRTStartup (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
 	goto i__leave;
     }
   _pei386_runtime_relocator ();
+
+#if defined(__x86_64__) && !defined(__SEH__)
+  if (dwReason == DLL_PROCESS_ATTACH)
+    __mingw_init_ehandler ();
+#endif
+
   if (dwReason == DLL_PROCESS_ATTACH || dwReason == DLL_THREAD_ATTACH)
     {
         retcode = _CRT_INIT (hDllHandle, dwReason, lpreserved);

lib/libc/mingw/crt/crtexe.c

@@ -58,11 +58,9 @@ extern void __main(void);
 static _TCHAR **argv;
 static _TCHAR **envp;
 
-static int argret;
 static int mainret=0;
 static int managedapp;
 static int has_cctor = 0;
-static _startupinfo startinfo;
 extern LPTOP_LEVEL_EXCEPTION_FILTER __mingw_oldexcpt_handler;
 
 extern void _pei386_runtime_relocator (void);
@@ -97,6 +95,7 @@ __mingw_invalidParameterHandler (const wchar_t * __UNUSED_PARAM_1(expression),
 static int __cdecl
 pre_c_init (void)
 {
+  int ret;
   managedapp = check_managed_app ();
   if (__mingw_app_type)
     __set_app_type(_GUI_APP);
@@ -107,10 +106,12 @@ pre_c_init (void)
   * __p__commode() = _commode;
 
 #ifdef _UNICODE
-  _wsetargv();
+  ret = _wsetargv();
 #else
-  _setargv();
+  ret = _setargv();
 #endif
+  if (ret < 0)
+    _amsg_exit(8); /* _RT_SPACEARG */
   if (_MINGW_INSTALL_DEBUG_MATHERR == 1)
     {
       __setusermatherr (_matherr);
@@ -125,13 +126,18 @@ pre_c_init (void)
 static void __cdecl
 pre_cpp_init (void)
 {
+  _startupinfo startinfo;
+  int argret;
+
   startinfo.newmode = _newmode;
 
 #ifdef _UNICODE
   argret = __wgetmainargs(&argc,&argv,&envp,_dowildcard,&startinfo);
 #else
   argret = __getmainargs(&argc,&argv,&envp,_dowildcard,&startinfo);
 #endif
+  if (argret < 0)
+    _amsg_exit(8); /* _RT_SPACEARG */
 }
 
 static int __tmainCRTStartup (void);
@@ -197,7 +203,7 @@ int mainCRTStartup (void)
 static
 #if defined(__i386__) || defined(_X86_)
 /* We need to make sure that we align the stack to 16 bytes for the sake of SSE
-   opts in main or in functions called main.  */
+   opts in main or in functions called from main.  */
 __attribute__((force_align_arg_pointer))
 #endif
 __declspec(noinline) int
@@ -223,7 +229,8 @@ __tmainCRTStartup (void)
     else if (__native_startup_state == __uninitialized)
       {
 	__native_startup_state = __initializing;
-	_initterm ((_PVFV *)(void *)__xi_a, (_PVFV *)(void *) __xi_z);
+	if (_initterm_e (__xi_a, __xi_z) != 0)
+	  return 255;
       }
     else
       has_cctor = 1;

lib/libc/mingw/crt/tlssup.c

@@ -32,6 +32,7 @@ typedef struct TlsDtorNode {
   _PVFV funcs[FUNCS_PER_NODE];
 } TlsDtorNode;
 
+__attribute__((used))
 ULONG _tls_index = 0;
 
 /* TLS raw template data start and end. 

lib/libc/mingw/def-include/crt-aliases.def.in

@@ -231,6 +231,12 @@ ADD_UNDERSCORE(y1)
 ADD_UNDERSCORE(yn)
 
 ; This is list of symbol aliases for C95 functions
+#ifdef WITH_GET_PUT_WCHAR_ALIASES
+getwc == fgetwc
+getwchar == _fgetwchar
+putwc == fputwc
+putwchar == _fputwchar
+#endif
 #ifdef USE_WCSTOK_S_FOR_WCSTOK
 wcstok == wcstok_s
 #endif
@@ -531,24 +537,22 @@ __ms_printf == printf
 __ms_scanf == scanf
 __ms_sprintf == sprintf
 __ms_sscanf == sscanf
-#ifdef PRE_C95_SWPRINTF
-__ms_swprintf == swprintf
-#else
-__ms_swprintf == _swprintf
-#endif
 __ms_swscanf == swscanf
 __ms_vfprintf == vfprintf
 __ms_vfwprintf == vfwprintf
 __ms_vprintf == vprintf
 __ms_vsprintf == vsprintf
-#ifdef PRE_C95_SWPRINTF
-__ms_vswprintf == vswprintf
-#else
-__ms_vswprintf == _vswprintf
-#endif
 __ms_vwprintf == vwprintf
 __ms_wprintf == wprintf
 __ms_wscanf == wscanf
+#ifdef WITH_MS_VSCANF_ALIASES
+__ms_vfscanf == vfscanf
+__ms_vfwscanf == vfwscanf
+__ms_vscanf == vscanf
+__ms_vsscanf == vsscanf
+__ms_vswscanf == vswscanf
+__ms_vwscanf == vwscanf
+#endif
 #endif
 
 ; This is list of additional symbol aliases not available in any library as neither native symbols nor aliases

lib/libc/mingw/include/msvcrt.h

@@ -1,10 +1,15 @@
-#include <winbase.h>
-
 #ifndef __LIBMSVCRT_OS__
 #error "This file should only be used in libmsvcrt-os.a"
 #endif
 
-static inline HANDLE __mingw_get_msvcrt_handle(void)
+#ifndef MSVCRT_H
+#define MSVCRT_H
+
+#include <winbase.h>
+
+static inline HMODULE __mingw_get_msvcrt_handle(void)
 {
-    return GetModuleHandleW(L"msvcrt.dll");
+    return GetModuleHandleA("msvcrt.dll");
 }
+
+#endif

lib/libc/mingw/crt/intrincs/RtlSecureZeroMemory.c renamed to lib/libc/mingw/intrincs/RtlSecureZeroMemory.c

@@ -25,6 +25,7 @@ AddVectoredContinueHandler
 AddVectoredExceptionHandler
 AdjustCalendarDate
 AllocConsole
+AllocConsoleWithOptions
 AllocateUserPhysicalPages
 AllocateUserPhysicalPagesNuma
 AppPolicyGetClrCompat
@@ -447,6 +448,7 @@ FindVolumeMountPointClose
 FlsAlloc
 FlsFree
 FlsGetValue
+FlsGetValue2
 FlsSetValue
 FlushConsoleInputBuffer
 FlushFileBuffers
@@ -626,6 +628,7 @@ GetFileAttributesW
 GetFileBandwidthReservation
 GetFileInformationByHandle
 GetFileInformationByHandleEx
+GetFileInformationByName
 GetFileMUIInfo
 GetFileMUIPath
 GetFileSize
@@ -1282,6 +1285,7 @@ ReleaseActCtxWorker
 ReleaseMutex
 ReleaseMutexWhenCallbackReturns
 ReleasePackageVirtualizationContext
+ReleasePseudoConsole
 ReleaseSRWLockExclusive
 ReleaseSRWLockShared
 ReleaseSemaphore
@@ -1543,6 +1547,7 @@ Thread32Next
 TlsAlloc
 TlsFree
 TlsGetValue
+TlsGetValue2
 TlsSetValue
 Toolhelp32ReadProcessMemory
 TransactNamedPipe

lib/libc/mingw/lib-common/kernel32.def.in

@@ -0,0 +1,89 @@
+_CreateFrameInfo
+F_I386(_CxxThrowException@8)
+F_NON_I386(_CxxThrowException)
+F_I386(_EH_prolog)
+_FindAndUnlinkFrame
+_IsExceptionObjectToBeDestroyed
+F_I386(_NLG_Dispatch2@4)
+F_I386(_NLG_Return@12)
+F_I386(_NLG_Return2)
+_SetWinRTOutOfMemoryExceptionCallback
+__AdjustPointer
+__BuildCatchObject
+__BuildCatchObjectHelper
+F_NON_I386(__C_specific_handler)
+F_NON_I386(__C_specific_handler_noexcept)
+__CxxDetectRethrow
+__CxxExceptionFilter
+__CxxFrameHandler
+__CxxFrameHandler2
+__CxxFrameHandler3
+F_I386(__CxxLongjmpUnwind@4)
+__CxxQueryExceptionSize
+__CxxRegisterExceptionObject
+__CxxUnregisterExceptionObject
+__DestructExceptionObject
+__FrameUnwindFilter
+__GetPlatformExceptionInfo
+F_NON_I386(__NLG_Dispatch2)
+F_NON_I386(__NLG_Return2)
+__RTCastToVoid
+__RTDynamicCast
+__RTtypeid
+__TypeMatch
+__current_exception
+__current_exception_context
+F_NON_ARM64(__intrinsic_setjmp)
+F_NON_I386(__intrinsic_setjmpex)
+F_ARM32(__jump_unwind)
+__processing_throw
+__report_gsfailure
+__std_exception_copy
+__std_exception_destroy
+__std_terminate
+__std_type_info_compare
+__std_type_info_destroy_list
+__std_type_info_hash
+__std_type_info_name
+__telemetry_main_invoke_trigger
+__telemetry_main_return_trigger
+__unDName
+__unDNameEx
+__uncaught_exception
+__uncaught_exceptions
+__vcrt_GetModuleFileNameW
+__vcrt_GetModuleHandleW
+__vcrt_InitializeCriticalSectionEx
+__vcrt_LoadLibraryExW
+F_I386(_chkesp)
+F_I386(_except_handler2)
+F_I386(_except_handler3)
+F_I386(_except_handler4_common)
+_get_purecall_handler
+_get_unexpected
+F_I386(_global_unwind2)
+_is_exception_typeof
+F64(_local_unwind)
+F_I386(_local_unwind2)
+F_I386(_local_unwind4)
+F_I386(_longjmpex)
+_purecall
+F_I386(_seh_longjmp_unwind4@4)
+F_I386(_seh_longjmp_unwind@4)
+_set_purecall_handler
+_set_se_translator
+F_I386(_setjmp3)
+longjmp
+memchr
+memcmp
+memcpy
+memmove
+memset
+set_unexpected
+strchr
+strrchr
+strstr
+unexpected
+wcschr
+wcsrchr
+wcsstr