mingw: Update MinGW-w64 sources to 38c8142f660b6ba11e7c408f2de1e9f8bfaf839e.

Author: alexrp

lib/libc/mingw/cfguard/mingw_cfguard_support.c

@@ -17,14 +17,6 @@
 // really matter here because this is a no-op anyway.
 static void __guard_check_icall_dummy(void) {}
 
-// When CFGuard is not active, directly tail-call the target address, which
-// is passed via %rax.
-__asm__(
-    ".globl __guard_dispatch_icall_dummy\n"
-    "__guard_dispatch_icall_dummy:\n"
-    "    jmp *%rax\n"
-);
-
 // This is intentionally declared as _not_ a function pointer, so that the
 // jmp instruction is not included as a valid call target for CFGuard.
 extern void *__guard_dispatch_icall_dummy;

lib/libc/mingw/crt/CRT_fp10.c

@@ -8,19 +8,11 @@ void _fpreset (void);
 
 void _fpreset (void)
 {
-#if defined(_ARM_) || defined(__arm__)
-  __asm__ __volatile__ (
-    "vmsr	fpscr, %0\n\t" : : "r"(0 /* INITIAL_FPSCR */));
-#elif defined(_ARM64_) || defined(__aarch64__)
-  __asm__ __volatile__ (
-    "msr	fpcr, %0\n\t" : : "r"(0LL /* INITIAL_FPSCR */));
-#else
 #ifdef __GNUC__
   __asm__ ("fninit");
 #else /* msvc: */
   __asm fninit;
 #endif
-#endif
 }
 
 #ifdef __GNUC__

lib/libc/mingw/crt/crtdll.c

@@ -4,12 +4,6 @@
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
-#ifdef CRTDLL
-#undef CRTDLL
-#ifndef _DLL
-#define _DLL
-#endif
-
 #include <oscalls.h>
 #include <internal.h>
 #include <stdlib.h>
@@ -19,20 +13,14 @@
 #include <crtdbg.h>
 
 #ifndef _CRTIMP
-#ifdef CRTDLL
-#define _CRTIMP __declspec(dllexport)
-#else
-#ifdef _DLL
 #define _CRTIMP __declspec(dllimport)
-#else
-#define _CRTIMP
-#endif
-#endif
 #endif
 #include <sect_attribs.h>
 #include <locale.h>
 
-extern void __cdecl _initterm(_PVFV *,_PVFV *);
+#if defined(__x86_64__) && !defined(__SEH__)
+extern int __mingw_init_ehandler (void);
+#endif
 extern void __main ();
 extern void _pei386_runtime_relocator (void);
 extern _PIFV __xi_a[];
@@ -50,20 +38,6 @@ static _onexit_table_t atexit_table;
 
 extern int __mingw_app_type;
 
-extern WINBOOL WINAPI DllMain (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved);
-
-extern WINBOOL WINAPI DllEntryPoint (HANDLE, DWORD, LPVOID);
-
-static int pre_c_init (void);
-
-_CRTALLOC(".CRT$XIAA") _PIFV pcinit = pre_c_init;
-
-static int
-pre_c_init (void)
-{
-  return _initialize_onexit_table(&atexit_table);
-}
-
 WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
 {
   if (dwReason == DLL_PROCESS_DETACH)
@@ -77,10 +51,11 @@ WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
     {
       void *lock_free = NULL;
       void *fiberid = ((PNT_TIB)NtCurrentTeb ())->StackBase;
-      int nested = FALSE;
+      BOOL nested = FALSE;
+      int ret = 0;
 
-      while ((lock_free = InterlockedCompareExchangePointer ((volatile PVOID *) &__native_startup_lock,
-							     fiberid, 0)) != 0)
+      while ((lock_free = InterlockedCompareExchangePointer (&__native_startup_lock,
+							     fiberid, NULL)) != 0)
 	{
 	  if (lock_free == fiberid)
 	    {
@@ -89,25 +64,37 @@ WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
 	    }
 	  Sleep(1000);
 	}
-      if (__native_startup_state == __initializing)
+      if (__native_startup_state != __uninitialized)
 	{
 	  _amsg_exit (31);
 	}
-      else if (__native_startup_state == __uninitialized)
+      else
 	{
 	  __native_startup_state = __initializing;
 
-	  if (_initterm_e (__xi_a, __xi_z) != 0)
-	    return FALSE;
-	}
-      if (__native_startup_state == __initializing)
-	{
+	  _pei386_runtime_relocator ();
+#if defined(__x86_64__) && !defined(__SEH__)
+	  __mingw_init_ehandler ();
+#endif
+	  ret = _initialize_onexit_table (&atexit_table);
+	  if (ret != 0)
+	    goto i__leave;
+	  ret = _initterm_e (__xi_a, __xi_z);
+	  if (ret != 0)
+	    goto i__leave;
 	  _initterm (__xc_a, __xc_z);
+	  __main ();
+
 	  __native_startup_state = __initialized;
 	}
+i__leave:
       if (! nested)
 	{
-	  (void) InterlockedExchangePointer ((volatile PVOID *) &__native_startup_lock, 0);
+	  (void) InterlockedExchangePointer (&__native_startup_lock, NULL);
+	}
+      if (ret != 0)
+	{
+	  return FALSE;
 	}
       if (__dyn_tls_init_callback != NULL)
 	{
@@ -118,8 +105,16 @@ WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
   else if (dwReason == DLL_PROCESS_DETACH)
     {
       void *lock_free = NULL;
-      while ((lock_free = InterlockedCompareExchangePointer ((volatile PVOID *) &__native_startup_lock,(PVOID) 1, 0)) != 0)
+      void *fiberid = ((PNT_TIB)NtCurrentTeb ())->StackBase;
+      BOOL nested = FALSE;
+
+      while ((lock_free = InterlockedCompareExchangePointer (&__native_startup_lock, fiberid, NULL)) != 0)
 	{
+	  if (lock_free == fiberid)
+	    {
+	      nested = TRUE;
+	      break;
+	    }
 	  Sleep(1000);
 	}
       if (__native_startup_state != __initialized)
@@ -130,84 +125,56 @@ WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
 	{
           _execute_onexit_table(&atexit_table);
 	  __native_startup_state = __uninitialized;
-	  (void) InterlockedExchangePointer ((volatile PVOID *) &__native_startup_lock, 0);
+	}
+      if (! nested)
+	{
+	  (void) InterlockedExchangePointer (&__native_startup_lock, NULL);
 	}
     }
   return TRUE;
 }
 
-static WINBOOL __DllMainCRTStartup (HANDLE, DWORD, LPVOID);
-
 WINBOOL WINAPI DllMainCRTStartup (HANDLE, DWORD, LPVOID);
-#if defined(__x86_64__) && !defined(__SEH__)
-int __mingw_init_ehandler (void);
-#endif
 
-__attribute__((used)) /* required due to GNU LD bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30300 */
-WINBOOL WINAPI
-DllMainCRTStartup (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
-{
-  __mingw_app_type = 0;
-  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.  */
+   opts in DllMain or in functions called from DllMain.  */
 __attribute__((force_align_arg_pointer))
 #endif
-__declspec(noinline) WINBOOL
-__DllMainCRTStartup (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
+__attribute__((used)) /* required due to GNU LD bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30300 */
+WINBOOL WINAPI
+DllMainCRTStartup (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
 {
   WINBOOL retcode = TRUE;
 
+  __mingw_app_type = 0;
   __native_dllmain_reason = dwReason;
-  if (dwReason == DLL_PROCESS_DETACH && __proc_attached == 0)
+  if (dwReason == DLL_PROCESS_DETACH && __proc_attached <= 0)
     {
 	retcode = FALSE;
 	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);
         if (!retcode)
           goto i__leave;
-        retcode = DllEntryPoint (hDllHandle, dwReason, lpreserved);
-	if (! retcode)
-	  {
-	    if (dwReason == DLL_PROCESS_ATTACH)
-	      _CRT_INIT (hDllHandle, DLL_PROCESS_DETACH, lpreserved);
-	    goto i__leave;
-	  }
     }
-  if (dwReason == DLL_PROCESS_ATTACH)
-    __main ();
   retcode = DllMain(hDllHandle,dwReason,lpreserved);
   if (dwReason == DLL_PROCESS_ATTACH && ! retcode)
     {
 	DllMain (hDllHandle, DLL_PROCESS_DETACH, lpreserved);
-	DllEntryPoint (hDllHandle, DLL_PROCESS_DETACH, lpreserved);
 	_CRT_INIT (hDllHandle, DLL_PROCESS_DETACH, lpreserved);
     }
   if (dwReason == DLL_PROCESS_DETACH || dwReason == DLL_THREAD_DETACH)
     {
-        retcode = DllEntryPoint (hDllHandle, dwReason, lpreserved);
-	if (_CRT_INIT (hDllHandle, dwReason, lpreserved) == FALSE)
-	  retcode = FALSE;
+	retcode = _CRT_INIT (hDllHandle, dwReason, lpreserved);
     }
 i__leave:
   __native_dllmain_reason = UINT_MAX;
   return retcode ;
 }
-#endif
 
 int __cdecl atexit (_PVFV func)
 {

lib/libc/mingw/crt/crtexe.c

@@ -4,13 +4,6 @@
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
-#undef CRTDLL
-#ifndef _DLL
-#define _DLL
-#endif
-
-#define SPECIAL_CRTEXE
-
 #include <oscalls.h>
 #include <internal.h>
 #include <process.h>
@@ -211,9 +204,9 @@ __tmainCRTStartup (void)
 {
     void *lock_free = NULL;
     void *fiberid = ((PNT_TIB)NtCurrentTeb())->StackBase;
-    int nested = FALSE;
-    while((lock_free = InterlockedCompareExchangePointer ((volatile PVOID *) &__native_startup_lock,
-							  fiberid, 0)) != 0)
+    BOOL nested = FALSE;
+    while((lock_free = InterlockedCompareExchangePointer (&__native_startup_lock,
+							  fiberid, NULL)) != 0)
       {
 	if (lock_free == fiberid)
 	  {
@@ -242,7 +235,7 @@ __tmainCRTStartup (void)
       }
     _ASSERTE(__native_startup_state == __initialized);
     if (! nested)
-      (VOID)InterlockedExchangePointer ((volatile PVOID *) &__native_startup_lock, 0);
+      (VOID)InterlockedExchangePointer (&__native_startup_lock, NULL);
 
     if (__dyn_tls_init_callback != NULL)
       __dyn_tls_init_callback (NULL, DLL_THREAD_ATTACH, NULL);

lib/libc/mingw/crt/crtexewin.c

@@ -56,7 +56,6 @@ int _tmain (int      __UNUSED_PARAM(argc),
 
   {
     STARTUPINFO StartupInfo;
-    memset (&StartupInfo, 0, sizeof (STARTUPINFO));
     GetStartupInfo (&StartupInfo);
     if (StartupInfo.dwFlags & STARTF_USESHOWWINDOW)
       nShowCmd = StartupInfo.wShowWindow;

lib/libc/mingw/crt/dll_argv.c

@@ -4,10 +4,6 @@
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
-#ifdef CRTDLL
-#undef CRTDLL
-#endif
-
 #include <internal.h>
 
 extern int _dowildcard;

lib/libc/mingw/crt/dllargv.c

@@ -4,10 +4,6 @@
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
-#ifdef CRTDLL
-#undef CRTDLL
-#endif
-
 #include <internal.h>
 
 int __CRTDECL

lib/libc/mingw/crt/natstart.c

@@ -10,5 +10,5 @@
 _PGLOBAL
 volatile unsigned int __native_dllmain_reason = UINT_MAX;
 volatile unsigned int __native_vcclrit_reason = UINT_MAX;
-volatile __enative_startup_state __native_startup_state;
-volatile void *__native_startup_lock;
+volatile __enative_startup_state __native_startup_state = __uninitialized;
+void *volatile __native_startup_lock = NULL;

lib/libc/mingw/crt/tlssup.c

@@ -6,10 +6,6 @@
  * Written by Kai Tietz  <kai.tietz@onevision.com>
  */
 
-#ifdef CRTDLL
-#undef CRTDLL
-#endif
-
 #include <sect_attribs.h>
 
 #ifndef WIN32_LEAN_AND_MEAN

lib/libc/mingw/gdtoa/strtodnrp.c

@@ -85,8 +85,7 @@ double __cdecl
 __mingw_strtod (const char * __restrict__ src, char ** __restrict__ endptr)
   __attribute__((alias("__strtod")));
 
-#if !(defined(_AMD64_) || defined(__x86_64__) || \
-  defined(_X86_) || defined(__i386__))
+#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
 /* For systems other than x86, where long double == double, provide the
  * long double functions as aliases to __strtod. */
 

lib/libc/mingw/gdtoa/strtopx.c

@@ -53,8 +53,19 @@ THIS SOFTWARE.
 #define _4 0
 #endif
 
+#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
+/* For ARM, where long double == double, provide the long double function as
+ * an alias for __strtod. Do this in a separate object file from other
+ * functions, to avoid linker conflicts if object files import both 'strtold'
+ * from libucrt*.a and the object file providing '__strtod'. */
+long double __cdecl
+strtold (const char * __restrict__ src, char ** __restrict__ endptr)
+{
+  return __mingw_strtod(src, endptr);
+}
+
 /* This is specific to the x86 80 bit long doubles. */
-#if defined(_AMD64_) || defined(__x86_64__) || \
+#elif defined(_AMD64_) || defined(__x86_64__) || \
   defined(_X86_) || defined(__i386__)
 
 typedef union lD {
@@ -133,14 +144,4 @@ long double __cdecl
 strtold (const char * __restrict__ src, char ** __restrict__ endptr)
   __attribute__((alias("__strtold")));
 
-#elif defined(__arm__) || defined(__aarch64__) || defined(_ARM_) || defined(_ARM64_)
-/* For ARM, where long double == double, provide the long double function as
- * an alias for __strtod. Do this in a separate object file from other
- * functions, to avoid linker conflicts if object files import both 'strtold'
- * from libucrt*.a and the object file providing '__strtod'. */
-long double __cdecl
-strtold (const char * __restrict__ src, char ** __restrict__ endptr)
-{
-  return __mingw_strtod(src, endptr);
-}
 #endif