Signed-off-by: Martin Storsjö <mar...@martin.st>
---
mingw-w64-crt/Makefile.am | 34 ++++++++++++++-----
.../api-ms-win-crt-math-l1-1-0.def.in | 16 ++++-----
mingw-w64-crt/lib-common/ucrtbase.def.in | 16 ++++-----
3 files changed, 41 insertions(+), 25 deletions(-)
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 4b4bef7c7..23c65ff70 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -176,6 +176,8 @@ src_msvcrt_common=\
stdio/vsnprintf_alias.c \
math/cbrt.c math/cbrtf.c \
math/copysign.c math/copysignf.c \
+ math/coshf.c \
+ math/expf.c \
math/fabs.c math/fabsf.c \
math/fdim.c math/fdimf.c \
math/fma.c math/fmaf.c \
@@ -185,14 +187,19 @@ src_msvcrt_common=\
math/hypot.c \
math/llrint.c math/llrintf.c \
math/llround.c math/llroundf.c \
+ math/log10f.c \
+ math/logf.c \
math/lrint.c math/lrintf.c \
math/lround.c math/lroundf.c \
- math/modf.c \
+ math/modf.c math/modff.c \
math/nextafterf.c \
math/nexttowardf.c \
+ math/powf.c \
math/round.c math/roundf.c \
math/s_erf.c math/sf_erf.c \
- math/sqrt.c \
+ math/sinhf.c \
+ math/sqrt.c math/sqrtf.c \
+ math/tanhf.c \
math/tgamma.c math/tgammaf.c
# Arch specific files included in all libmsvcr*.a on x86
@@ -389,6 +396,15 @@ src_ucrtbase32=\
$(src_ucrtbase) \
math/fabsf.c \
math/nexttowardf.c \
+ math/coshf.c \
+ math/expf.c \
+ math/log10f.c \
+ math/logf.c \
+ math/modff.c \
+ math/powf.c \
+ math/sinhf.c \
+ math/sqrtf.c \
+ math/tanhf.c \
math/x86/acosf.c \
math/x86/asinf.c \
math/x86/atan2f.c \
@@ -688,17 +704,17 @@ src_libmingwex=\
gdtoa/misc.c gdtoa/qnan.c gdtoa/smisc.c gdtoa/strtodg.c
gdtoa/strtodnrp.c gdtoa/strtof.c \
gdtoa/strtopx.c gdtoa/sum.c gdtoa/ulp.c \
\
- math/coshf.c math/coshl.c math/expf.c \
+ math/coshl.c \
math/fabsl.c math/fp_consts.c math/fp_constsf.c \
math/fp_constsl.c math/fpclassify.c math/fpclassifyf.c
math/fpclassifyl.c math/frexpf.c math/frexpl.c \
math/hypotf.c math/hypotl.c math/isnan.c math/isnanf.c
math/isnanl.c \
- math/ldexpf.c math/lgamma.c math/lgammaf.c
math/lgammal.c math/log10f.c math/logf.c \
- math/modff.c math/modfl.c math/nextafterl.c
math/nexttoward.c \
- math/powf.c math/powi.c math/powif.c math/powil.c
\
+ math/ldexpf.c math/lgamma.c math/lgammaf.c
math/lgammal.c \
+ math/modfl.c math/nextafterl.c math/nexttoward.c \
+ math/powi.c math/powif.c math/powil.c \
math/signbit.c math/signbitf.c math/signbitl.c \
- math/signgam.c math/sinhf.c math/sinhl.c math/sqrtf.c
math/sqrtl.c \
- math/tanhf.c math/tanhl.c \
- math/powi.def.h math/sqrt.def.h \
+ math/signgam.c \
+ math/sinhl.c math/sqrtl.c math/tanhl.c \
+ math/powi.def.h math/sqrt.def.h \
math/cephes_mconf.h math/fp_consts.h \
\
misc/mb_wc_common.h \
diff --git a/mingw-w64-crt/lib-common/api-ms-win-crt-math-l1-1-0.def.in
b/mingw-w64-crt/lib-common/api-ms-win-crt-math-l1-1-0.def.in
index 155182ae7..9493e5711 100644
--- a/mingw-w64-crt/lib-common/api-ms-win-crt-math-l1-1-0.def.in
+++ b/mingw-w64-crt/lib-common/api-ms-win-crt-math-l1-1-0.def.in
@@ -224,7 +224,7 @@ cos
F_NON_I386(cosf)
F_ARM_ANY(cosl == cos)
cosh
-F_NON_I386(coshf DATA)
+F_NON_I386(coshf)
cpow
cpowf
cpowl
@@ -259,7 +259,7 @@ exp
exp2
exp2f
exp2l F_X86_ANY(DATA)
-F_NON_I386(expf F_X86_ANY(DATA))
+F_NON_I386(expf)
F_ARM_ANY(expl == exp)
expm1
expm1f
@@ -303,7 +303,7 @@ llroundf
llroundl F_X86_ANY(DATA)
log
log10
-F_NON_I386(log10f F_X86_ANY(DATA))
+F_NON_I386(log10f)
F_ARM_ANY(log10l == log10)
log1p
log1pf
@@ -314,7 +314,7 @@ log2l F_X86_ANY(DATA)
logb
logbf
logbl F_X86_ANY(DATA)
-F_NON_I386(logf F_X86_ANY(DATA))
+F_NON_I386(logf)
F_ARM_ANY(logl == log)
lrint
lrintf
@@ -323,7 +323,7 @@ lround
lroundf
lroundl F_X86_ANY(DATA)
modf
-F_NON_I386(modff DATA)
+F_NON_I386(modff)
nan
nanf
nanl F_X86_ANY(DATA)
@@ -342,7 +342,7 @@ norm
normf
norml
pow
-F_NON_I386(powf F_X86_ANY(DATA))
+F_NON_I386(powf)
F_ARM_ANY(powl == pow)
remainder
remainderf
@@ -367,9 +367,9 @@ F_NON_I386(sinf)
F_ARM_ANY(sinl == sin)
; if we implement sinh, we can set it DATA only.
sinh
-F_NON_I386(sinhf DATA)
+F_NON_I386(sinhf)
sqrt
-F_NON_I386(sqrtf DATA)
+F_NON_I386(sqrtf)
tan
F_NON_I386(tanf)
F_ARM_ANY(tanl == tan)
diff --git a/mingw-w64-crt/lib-common/ucrtbase.def.in
b/mingw-w64-crt/lib-common/ucrtbase.def.in
index 2e4459b7d..000861ee3 100644
--- a/mingw-w64-crt/lib-common/ucrtbase.def.in
+++ b/mingw-w64-crt/lib-common/ucrtbase.def.in
@@ -2273,7 +2273,7 @@ cos
F_NON_I386(cosf)
F_ARM_ANY(cosl == cos)
cosh
-F_NON_I386(coshf DATA)
+F_NON_I386(coshf)
cpow
cpowf
cpowl
@@ -2310,7 +2310,7 @@ exp
exp2
exp2f
exp2l F_X86_ANY(DATA)
-F_NON_I386(expf F_X86_ANY(DATA))
+F_NON_I386(expf)
F_ARM_ANY(expl == exp)
expm1
expm1f
@@ -2433,7 +2433,7 @@ llroundl F_X86_ANY(DATA)
localeconv
log
log10
-F_NON_I386(log10f F_X86_ANY(DATA))
+F_NON_I386(log10f)
F_ARM_ANY(log10l == log10)
log1p
log1pf
@@ -2444,7 +2444,7 @@ log2l F_X86_ANY(DATA)
logb
logbf
logbl F_X86_ANY(DATA)
-F_NON_I386(logf F_X86_ANY(DATA))
+F_NON_I386(logf)
F_ARM_ANY(logl == log)
longjmp
lrint
@@ -2472,7 +2472,7 @@ memmove
memmove_s
memset
modf
-F_NON_I386(modff DATA)
+F_NON_I386(modff)
nan
nanf
nanl F_X86_ANY(DATA)
@@ -2492,7 +2492,7 @@ normf
norml
perror
pow
-F_NON_I386(powf F_X86_ANY(DATA))
+F_NON_I386(powf)
F_ARM_ANY(powl == pow)
putc
putchar
@@ -2539,9 +2539,9 @@ F_NON_I386(sinf)
F_ARM_ANY(sinl == sin)
; if we implement sinh, we can set it DATA only.
sinh
-F_NON_I386(sinhf DATA)
+F_NON_I386(sinhf)
sqrt
-F_NON_I386(sqrtf DATA)
+F_NON_I386(sqrtf)
srand
strcat
strcat_s
--
2.34.1
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
