mingw: Update MinGW-w64 definitions to 38c8142f660b6ba11e7c408f2de1e9f8bfaf839e.

Author: alexrp

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

@@ -137,8 +137,11 @@ ADD_UNDERSCORE(spawnve)
 ADD_UNDERSCORE(spawnvp)
 ADD_UNDERSCORE(spawnvpe)
 #endif
-#ifndef CRTDLL
-; stat is provided by mingw to workaround trailing slash issue in _stat
+#ifdef UCRTBASE
+F32(stat == _stat32)
+F64(stat == _stat64i32)
+#else
+; stat for non-UCRT is provided by mingw to workaround trailing slash issue in _stat
 #endif
 #ifdef NO_STRCMPI_ALIAS
 ; Symbol _strcmpi is natively present and defined in the library def file
@@ -208,7 +211,11 @@ ADD_UNDERSCORE(write)
 ; This is list of symbol aliases added in the Visual C++ 2.0 oldnames.lib library
 ; All these symbols with leading underscore are present also in pre-2.0 CRT versions: crtdll.dll and msvcrt10.dll
 ; ADD_UNDERSCORE(control87)
+#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
+ADD_UNDERSCORE(fpreset)
+#else
 ; ADD_UNDERSCORE(fpreset) ; Alias fpreset is set in CRT_fp10.c and CRT_fp8.c
+#endif
 ADD_UNDERSCORE(wcsdup)
 ADD_UNDERSCORE(wcsicmp)
 ADD_UNDERSCORE(wcsicoll)
@@ -222,7 +229,11 @@ ADD_UNDERSCORE(wcsupr)
 ; This is list of symbol aliases added in the Visual C++ 4.0 oldnames.lib library
 ; All these symbols with leading underscore are present also in pre-4.0 CRT versions: crtdll.dll, msvcrt10.dll and msvcrt20.dll
 ; ADD_UNDERSCORE(cabs)
+#ifdef UCRTBASE
+; hypot is natively exported from UCRT
+#else
 ADD_UNDERSCORE(hypot)
+#endif
 ADD_UNDERSCORE(j0)
 ADD_UNDERSCORE(j1)
 ADD_UNDERSCORE(jn)
@@ -247,27 +258,26 @@ wcstok == wcstok_s
 ADD_UNDERSCORE(nextafter)
 #endif
 
-#if defined(DEF_ARM32) || defined(DEF_ARM64)
 ; This is list of symbol aliases for C99 ARM long double functions
 ; They are defined as aliases to regular double symbols as on ARM, long double is equal to regular double
-acosl == acos
-asinl == asin
-atan2l == atan2
-atanl == atan
-ceill == ceil
-cosl == cos
-expl == exp
-floorl == floor
-fmodl == fmod
-log10l == log10
-logl == log
+F_LD64(acosl == acos)
+F_LD64(asinl == asin)
+F_LD64(atan2l == atan2)
+F_LD64(atanl == atan)
+F_LD64(ceill == ceil)
+F_LD64(cosl == cos)
+F_LD64(expl == exp)
+F_LD64(floorl == floor)
+F_LD64(fmodl == fmod)
+F_LD64(log10l == log10)
+F_LD64(logl == log)
 ; FIXME: Why is powl alias defined only for UCRT?
 #ifdef UCRTBASE
-powl == pow
-#endif
-sinl == sin
-tanl == tan
+F_LD64(powl == pow)
 #endif
+F_LD64(sinl == sin)
+F_LD64(tanl == tan)
+F_LD64(_chgsignl == _chgsign)
 
 ; This is list of symbol aliases for C11 functions
 #ifdef UCRTBASE
@@ -290,6 +300,22 @@ ADD_UNDERSCORE(popen)
 fgetpos64 == fgetpos
 fsetpos64 == fsetpos
 #endif
+#ifdef UCRTBASE
+stat32 == _stat32
+stat32i64 == _stat32i64
+stat64 == _stat64
+stat64i32 == _stat64i32
+#else
+; stat for non-UCRT is provided by mingw to workaround trailing slash issue in _stat
+#endif
+#ifdef FIXED_SIZE_SYMBOLS
+// NO_FIXED_SIZE_64_ALIAS means that DLL provides the native _fstat64 symbol
+#if defined(NO_FIXED_SIZE_64_ALIAS) && !defined(NO_FSTAT64_ALIAS)
+fstat64 == _fstat64
+#endif
+#else
+fstat64 == _fstat64
+#endif
 
 ; This is list of symbol aliases for GNU functions which are not part of POSIX or ISO C
 strcasecmp == _stricmp
@@ -545,19 +571,23 @@ __ms_vsprintf == vsprintf
 __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
 ; FIXME: check if these really are needed
 
+; This is wstat and wstat64 symbol available only in mingw but for a long time
+#ifdef UCRTBASE
+F32(wstat == _wstat32)
+F64(wstat == _wstat64i32)
+wstat32 == _wstat32
+wstat32i64 == _wstat32i64
+wstat64 == _wstat64
+wstat64i32 == _wstat64i32
+#else
+; wstat for non-UCRT is provided by mingw to workaround trailing slash issue in _wstat
+#endif
+
 ; Origin of the symbol wcscmpi is unknown. This symbol is not present in
 ; crtdll.dll and neither in any msvcr* version. The only source of wcscmpi is
 ; wcstr.h header file from the Microsoft Visual C++ 1.0 (32-bit for NT) and

lib/libc/mingw/def-include/func.def.in

@@ -12,26 +12,26 @@
 // F_NON_I386  - function available on everything but i386
 // F_NON_X64   - function available on everything but x86_64
 // F_NON_ARM64 - function available on everything but arm64
-#if defined(DEF_X64)
+#if defined(__x86_64__)
 #define F64(x) x
 #define F_X64(x) x
 #define F_X86_ANY(x) x
 #define F_NON_I386(x) x
 #define F_NON_ARM64(x) x
-#elif defined(DEF_I386)
+#elif defined(__i386__)
 #define F32(x) x
 #define F_I386(x) x
 #define F_X86_ANY(x) x
 #define F_NON_X64(x) x
 #define F_NON_ARM64(x) x
-#elif defined(DEF_ARM32)
+#elif defined(__arm__)
 #define F32(x) x
 #define F_ARM32(x) x
 #define F_ARM_ANY(x) x
 #define F_NON_I386(x) x
 #define F_NON_X64(x) x
 #define F_NON_ARM64(x) x
-#elif defined(DEF_ARM64)
+#elif defined(__aarch64__)
 #define F64(x) x
 #define F_ARM64(x) x
 #define F_ARM_ANY(x) x
@@ -75,9 +75,17 @@
 #define F_NON_ARM64(x)
 #endif
 
-#if defined(DEF_I386)
+#if defined(__i386__)
 #define STDCALL_DECORATED_EXPORT(symbol) symbol == _ ## symbol
 #define FASTCALL_DECORATED_EXPORT(symbol) symbol == symbol
 #endif
 
+#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
+#define F_LD64(x) x
+#define F_LD80(x)
+#else
+#define F_LD64(x)
+#define F_LD80(x) x
+#endif
+
 #endif // FUNC_DEF_IN

lib/libc/mingw/lib-common/api-ms-win-crt-convert-l1-1-0.def.in

@@ -47,7 +47,7 @@ _strtoi64
 _strtoi64_l
 _strtoimax_l
 _strtol_l
-F_ARM_ANY(_strtold_l) ; Can't use long double functions from the CRT on x86
+F_LD64(_strtold_l) ; Can't use long double functions from the CRT on x86
 _strtoll_l
 _strtoui64
 _strtoui64_l
@@ -68,7 +68,7 @@ _wcstoi64
 _wcstoi64_l
 _wcstoimax_l
 _wcstol_l
-F_ARM_ANY(_wcstold_l) ; Can't use long double functions from the CRT on x86
+F_LD64(_wcstold_l) ; Can't use long double functions from the CRT on x86
 _wcstoll_l
 _wcstombs_l
 _wcstombs_s_l
@@ -108,7 +108,7 @@ strtod
 strtof
 strtoimax
 strtol
-F_ARM_ANY(strtold) ; Can't use long double functions from the CRT on x86
+F_LD64(strtold) ; Can't use long double functions from the CRT on x86
 strtoll
 strtoul
 strtoull
@@ -121,7 +121,7 @@ wcstod
 wcstof
 wcstoimax
 wcstol
-F_ARM_ANY(wcstold) ; Can't use long double functions from the CRT on x86
+F_LD64(wcstold) ; Can't use long double functions from the CRT on x86
 wcstoll
 wcstombs
 wcstombs_s

lib/libc/mingw/lib-common/api-ms-win-crt-filesystem-l1-1-0.def.in

@@ -39,6 +39,7 @@ F64(_fstati64 == _fstat64)
 _fstat32
 _fstat32i64
 _fstat64
+fstat64 == _fstat64
 _fstat64i32
 _fullpath
 _getdiskfree
@@ -53,14 +54,20 @@ _rmdir
 rmdir == _rmdir
 _splitpath
 _splitpath_s
+F32(stat == _stat32)
+F64(stat == _stat64i32)
 F32(_stat == _stat32)
 F64(_stat == _stat64i32)
 F32(_stati64 == _stat32i64)
 F64(_stati64 == _stat64)
 _stat32
+stat32 == _stat32
 _stat32i64
+stat32i64 == _stat32i64
 _stat64
+stat64 == _stat64
 _stat64i32
+stat64i32 == _stat64i32
 _umask
 umask == _umask
 _umask_s
@@ -96,14 +103,20 @@ _wrename
 _wrmdir
 _wsplitpath
 _wsplitpath_s
+F32(wstat == _wstat32)
+F64(wstat == _wstat64i32)
 F32(_wstat == _wstat32)
 F64(_wstat == _wstat64i32)
 F32(_wstati64 == _wstat32i64)
 F64(_wstati64 == _wstat64)
 _wstat32
+wstat32 == _wstat32
 _wstat32i64
+wstat32i64 == _wstat32i64
 _wstat64
+wstat64 == _wstat64
 _wstat64i32
+wstat64i32 == _wstat64i32
 _wunlink
 remove
 rename