crt: msvcr120 and UCRT: Fix 64 bit _(w)findfirst and _(w)findnext symbol aliases
These symbols on 64 bit should resolve to _findfirst64i32/_findnext64i32
functions, like in other CRT libraries and header files.
The UCRT 32 bit aliases are kept as they were before (even if
they are known to be incorrect); they are corrected in a separate
later commit.
Signed-off-by: Martin Storsjö <martin@martin.st>
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index e6a2144..97ba61e 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -1114,6 +1114,7 @@
lib32/msvcr80.def lib32/msvcr90.def lib32/msvcr90d.def lib32/msvcr100.def lib32/msvcr110.def lib32/msvcr120.def lib32/msvcr120d.def \
lib32/msvcr120_app.def lib32/msvcp120_app.def lib32/ucrtbase.def \
lib32/api-ms-win-crt-math-l1-1-0.def lib32/api-ms-win-crt-private-l1-1-0.def lib32/api-ms-win-crt-runtime-l1-1-0.def \
+ lib32/api-ms-win-crt-filesystem-l1-1-0.def \
lib32/vcruntime140_app.def
endif
@@ -1490,6 +1491,7 @@
lib64/advapi32.def lib64/clbcatq.def lib64/kernel32.def lib64/ole32.def \
lib64/oleaut32.def lib64/user32.def lib64/ws2_32.def \
lib64/api-ms-win-crt-math-l1-1-0.def lib64/api-ms-win-crt-private-l1-1-0.def lib64/api-ms-win-crt-runtime-l1-1-0.def \
+ lib64/api-ms-win-crt-filesystem-l1-1-0.def \
lib64/vcruntime140_app.def
endif
@@ -1832,6 +1834,7 @@
libarm32/advapi32.def libarm32/clbcatq.def libarm32/kernel32.def libarm32/ole32.def libarm32/oleaut32.def \
libarm32/user32.def libarm32/ws2_32.def \
libarm32/api-ms-win-crt-math-l1-1-0.def libarm32/api-ms-win-crt-private-l1-1-0.def libarm32/api-ms-win-crt-runtime-l1-1-0.def \
+ libarm32/api-ms-win-crt-filesystem-l1-1-0.def \
libarm32/vcruntime140_app.def
endif
@@ -2126,6 +2129,7 @@
libarm64/advapi32.def libarm64/clbcatq.def libarm64/kernel32.def libarm64/ole32.def libarm64/oleaut32.def \
libarm64/user32.def libarm64/ws2_32.def \
libarm64/api-ms-win-crt-math-l1-1-0.def libarm64/api-ms-win-crt-private-l1-1-0.def libarm64/api-ms-win-crt-runtime-l1-1-0.def \
+ libarm64/api-ms-win-crt-filesystem-l1-1-0.def \
libarm64/vcruntime140_app.def
endif
diff --git a/mingw-w64-crt/lib-common/api-ms-win-crt-filesystem-l1-1-0.def b/mingw-w64-crt/lib-common/api-ms-win-crt-filesystem-l1-1-0.def.in
similarity index 85%
rename from mingw-w64-crt/lib-common/api-ms-win-crt-filesystem-l1-1-0.def
rename to mingw-w64-crt/lib-common/api-ms-win-crt-filesystem-l1-1-0.def.in
index 45ae728..219361b 100644
--- a/mingw-w64-crt/lib-common/api-ms-win-crt-filesystem-l1-1-0.def
+++ b/mingw-w64-crt/lib-common/api-ms-win-crt-filesystem-l1-1-0.def.in
@@ -2,6 +2,8 @@
EXPORTS
+#include "func.def.in"
+
_access
; access is provided as an alias for __mingw_access
; access == _access
@@ -12,12 +14,14 @@
_chmod
chmod == _chmod
_findclose
-_findfirst == _findfirst64
+F32(_findfirst == _findfirst64)
+F64(_findfirst == _findfirst64i32)
_findfirst32
_findfirst32i64
_findfirst64
_findfirst64i32
-_findnext == _findnext64
+F32(_findnext == _findnext64)
+F64(_findnext == _findnext64i32)
_findnext32
_findnext32i64
_findnext64
diff --git a/mingw-w64-crt/lib-common/msvcr120_app.def.in b/mingw-w64-crt/lib-common/msvcr120_app.def.in
index 1cc7548..e2474e7 100644
--- a/mingw-w64-crt/lib-common/msvcr120_app.def.in
+++ b/mingw-w64-crt/lib-common/msvcr120_app.def.in
@@ -1111,7 +1111,7 @@
F_X86_ANY(_findfirst32i64)
_findfirst64
F_X86_ANY(_findfirst64i32)
-F_X64(_findfirst == _findfirst64)
+F_X64(_findfirst == _findfirst64i32)
F_ARM32(_findfirsti64)
F_ARM32(_findnext)
F_X86_ANY(_findnext32)
@@ -1119,7 +1119,7 @@
F_X86_ANY(_findnext32i64)
_findnext64
F_X86_ANY(_findnext64i32)
-F_X64(_findnext == _findnext64)
+F_X64(_findnext == _findnext64i32)
F_ARM32(_findnexti64)
_finite
F_NON_I386(_finitef)
@@ -1912,7 +1912,7 @@
F_X86_ANY(_wfindfirst32i64)
_wfindfirst64
F_X86_ANY(_wfindfirst64i32)
-F_X64(_wfindfirst == _wfindfirst64)
+F_X64(_wfindfirst == _wfindfirst64i32)
F_ARM32(_wfindfirsti64)
F_ARM32(_wfindnext)
F_X86_ANY(_wfindnext32)
@@ -1920,7 +1920,7 @@
F_X86_ANY(_wfindnext32i64)
_wfindnext64
F_X86_ANY(_wfindnext64i32)
-F_X64(_wfindnext == _wfindnext64)
+F_X64(_wfindnext == _wfindnext64i32)
F_ARM32(_wfindnexti64)
_wfopen
_wfopen_s
diff --git a/mingw-w64-crt/lib-common/ucrtbase.def.in b/mingw-w64-crt/lib-common/ucrtbase.def.in
index 2d0552f..4a7d644 100644
--- a/mingw-w64-crt/lib-common/ucrtbase.def.in
+++ b/mingw-w64-crt/lib-common/ucrtbase.def.in
@@ -327,12 +327,14 @@
_filelengthi64
_fileno
_findclose
-_findfirst == _findfirst64
+F32(_findfirst == _findfirst64)
+F64(_findfirst == _findfirst64i32)
_findfirst32
_findfirst32i64
_findfirst64
_findfirst64i32
-_findnext == _findnext64
+F32(_findnext == _findnext64)
+F64(_findnext == _findnext64i32)
_findnext32
_findnext32i64
_findnext64
diff --git a/mingw-w64-crt/lib64/msvcr120.def.in b/mingw-w64-crt/lib64/msvcr120.def.in
index 2456440..e51ab1b 100644
--- a/mingw-w64-crt/lib64/msvcr120.def.in
+++ b/mingw-w64-crt/lib64/msvcr120.def.in
@@ -951,12 +951,12 @@
_findfirst32
_findfirst32i64
_findfirst64
-_findfirst == _findfirst64
+_findfirst == _findfirst64i32
_findfirst64i32
_findnext32
_findnext32i64
_findnext64
-_findnext == _findnext64
+_findnext == _findnext64i32
_findnext64i32
_finite
_finitef
diff --git a/mingw-w64-crt/lib64/msvcr120d.def.in b/mingw-w64-crt/lib64/msvcr120d.def.in
index 539591c..2ee6e5e 100644
--- a/mingw-w64-crt/lib64/msvcr120d.def.in
+++ b/mingw-w64-crt/lib64/msvcr120d.def.in
@@ -1003,12 +1003,12 @@
_findfirst32
_findfirst32i64
_findfirst64
-_findfirst == _findfirst64
+_findfirst == _findfirst64i32
_findfirst64i32
_findnext32
_findnext32i64
_findnext64
-_findnext == _findnext64
+_findnext == _findnext64i32
_findnext64i32
_finite
_finitef
