---
v2: Fixed unprefixed aliases.y
mingw-w64-crt/Makefile.am | 4 ----
mingw-w64-crt/def-include/func.def.in | 8 ++++++++
.../lib-common/api-ms-win-crt-runtime-l1-1-0.def.in | 5 +++--
mingw-w64-crt/lib-common/msvcr120_app.def.in | 1 +
mingw-w64-crt/lib-common/msvcrt.def.in | 4 +++-
mingw-w64-crt/lib-common/ucrtbase-common.def.in | 4 +++-
mingw-w64-crt/libarm32/msvcr110d.def.in | 1 +
mingw-w64-crt/libarm32/msvcr120.def.in | 1 +
mingw-w64-crt/libarm32/msvcr120d.def.in | 1 +
9 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 217c0325f..7ad106719 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -1951,8 +1951,6 @@ else
crt32_DATA =
endif
-src_libmingw32 += crt/CRT_fp8.c
-
COMPILE32=$(COMPILE) $(CPPFLAGSARM32) $(extra_include) -D_SYSCRT=1
libarm32/crt1.o: crt/crtexe.c
$(COMPILE32) -c $< -o $@
@@ -2275,8 +2273,6 @@ else
crt64_DATA =
endif
-src_libmingw32 += crt/CRT_fp8.c
-
COMPILE64=$(COMPILE) $(CPPFLAGSARM64) $(extra_include) -D_SYSCRT=1
libarm64/crt1.o: crt/crtexe.c
$(COMPILE64) -c $< -o $@
diff --git a/mingw-w64-crt/def-include/func.def.in
b/mingw-w64-crt/def-include/func.def.in
index 77540bb31..991c9c6b1 100644
--- a/mingw-w64-crt/def-include/func.def.in
+++ b/mingw-w64-crt/def-include/func.def.in
@@ -80,4 +80,12 @@
#define FASTCALL_DECORATED_EXPORT(symbol) symbol == symbol
#endif
+#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
+#define F_FP64(x) x
+#define F_FP80(x)
+#else
+#define F_FP64(x)
+#define F_FP80(x) x
+#endif
+
#endif // FUNC_DEF_IN
diff --git a/mingw-w64-crt/lib-common/api-ms-win-crt-runtime-l1-1-0.def.in
b/mingw-w64-crt/lib-common/api-ms-win-crt-runtime-l1-1-0.def.in
index ea310d426..1612d9d09 100644
--- a/mingw-w64-crt/lib-common/api-ms-win-crt-runtime-l1-1-0.def.in
+++ b/mingw-w64-crt/lib-common/api-ms-win-crt-runtime-l1-1-0.def.in
@@ -44,8 +44,8 @@ _errno
_execute_onexit_table
_exit
F_NON_I386(_fpieee_flt)
-; DATA added manually
-_fpreset DATA
+F_FP64(_fpreset)
+F_FP80(_fpreset DATA)
_get_doserrno
_get_errno
_get_initial_narrow_environment
@@ -109,6 +109,7 @@ fesetenv DATA
fesetexceptflag DATA
fesetround DATA
fetestexcept DATA
+F_FP64(fpreset == _fpreset)
perror
quick_exit
raise
diff --git a/mingw-w64-crt/lib-common/msvcr120_app.def.in
b/mingw-w64-crt/lib-common/msvcr120_app.def.in
index 86747ec4e..eccf24885 100644
--- a/mingw-w64-crt/lib-common/msvcr120_app.def.in
+++ b/mingw-w64-crt/lib-common/msvcr120_app.def.in
@@ -2019,6 +2019,7 @@ fmod
F_NON_I386(fmodf)
fopen
fopen_s
+fpreset == _fpreset
fprintf
fprintf_s
fputc
diff --git a/mingw-w64-crt/lib-common/msvcrt.def.in
b/mingw-w64-crt/lib-common/msvcrt.def.in
index ff9e6a635..1a2b1ae5a 100644
--- a/mingw-w64-crt/lib-common/msvcrt.def.in
+++ b/mingw-w64-crt/lib-common/msvcrt.def.in
@@ -603,7 +603,8 @@ _flushall
_fmode DATA
_fpclass
F_NON_X64(_fpieee_flt)
-_fpreset DATA
+F_FP64(_fpreset)
+F_FP80(_fpreset DATA)
_fputchar
_fputwchar
_fsopen
@@ -968,6 +969,7 @@ fgetws
floor F_X86_ANY(DATA)
fmod F_X86_ANY(DATA)
fopen
+F_FP64(fpreset == _fpreset)
fprintf
fputc
fputs
diff --git a/mingw-w64-crt/lib-common/ucrtbase-common.def.in
b/mingw-w64-crt/lib-common/ucrtbase-common.def.in
index 7af5acde8..02863f1e6 100644
--- a/mingw-w64-crt/lib-common/ucrtbase-common.def.in
+++ b/mingw-w64-crt/lib-common/ucrtbase-common.def.in
@@ -388,7 +388,8 @@ _flushall
_fpclass
F_X64(_fpclassf)
_fpieee_flt
-_fpreset DATA ; DATA added manually
+F_FP64(_fpreset)
+F_FP80(_fpreset DATA)
_fputc_nolock
_fputchar
_fputwc_nolock
@@ -2378,6 +2379,7 @@ fmod
F_NON_I386(fmodf)
fopen
fopen_s
+F_FP64(fpreset == _fpreset)
fputc
fputs
fputwc
diff --git a/mingw-w64-crt/libarm32/msvcr110d.def.in
b/mingw-w64-crt/libarm32/msvcr110d.def.in
index 66a344ce8..ec4736cc1 100644
--- a/mingw-w64-crt/libarm32/msvcr110d.def.in
+++ b/mingw-w64-crt/libarm32/msvcr110d.def.in
@@ -1819,6 +1819,7 @@ fmod
fmodf
fopen
fopen_s
+fpreset == _fpreset
fprintf
fprintf_s
fputc
diff --git a/mingw-w64-crt/libarm32/msvcr120.def.in
b/mingw-w64-crt/libarm32/msvcr120.def.in
index 0f5c42508..ec6643da5 100644
--- a/mingw-w64-crt/libarm32/msvcr120.def.in
+++ b/mingw-w64-crt/libarm32/msvcr120.def.in
@@ -1902,6 +1902,7 @@ fmod
fmodf
fopen
fopen_s
+fpreset == _fpreset
fprintf
fprintf_s
fputc
diff --git a/mingw-w64-crt/libarm32/msvcr120d.def.in
b/mingw-w64-crt/libarm32/msvcr120d.def.in
index 7241a9e7b..b79ecdcb3 100644
--- a/mingw-w64-crt/libarm32/msvcr120d.def.in
+++ b/mingw-w64-crt/libarm32/msvcr120d.def.in
@@ -1967,6 +1967,7 @@ fmod
fmodf
fopen
fopen_s
+fpreset == _fpreset
fprintf
fprintf_s
fputc
--
2.48.1
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
