These are functions that are present in UCRT on all architctures except for x86_32.
Signed-off-by: Martin Storsjö <mar...@martin.st> --- mingw-w64-crt/Makefile.am | 41 ++++++++++++++----- .../api-ms-win-crt-math-l1-1-0.def.in | 20 ++++----- mingw-w64-crt/lib-common/ucrtbase.def.in | 20 ++++----- 3 files changed, 51 insertions(+), 30 deletions(-) diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am index 8d7c060c4..a3e6d10a3 100644 --- a/mingw-w64-crt/Makefile.am +++ b/mingw-w64-crt/Makefile.am @@ -220,7 +220,18 @@ src_msvcrt_common_add_x86=\ math/x86/rint.c math/x86/rintf.c \ math/x86/scalbn.S math/x86/scalbnf.S \ math/x86/sin.c \ - math/x86/trunc.S math/x86/truncf.S + math/x86/trunc.S math/x86/truncf.S \ + \ + math/x86/acosf.c \ + math/x86/asinf.c \ + math/x86/atan2f.c \ + math/x86/atanf.c \ + math/x86/ceilf.S \ + math/x86/cosf.c \ + math/x86/floorf.S \ + math/x86/fmodf.c \ + math/x86/sinf.c \ + math/x86/tanf.c # Arch specific files included in all libmsvcr*.a on x86_32 src_msvcrt_common_add_x86_32=\ @@ -374,7 +385,17 @@ src_ucrtapp=\ # Files included in libucrt*.a on x86_32 src_ucrtbase32=\ - $(src_ucrtbase) + $(src_ucrtbase) \ + math/x86/acosf.c \ + math/x86/asinf.c \ + math/x86/atan2f.c \ + math/x86/atanf.c \ + math/x86/ceilf.S \ + math/x86/cosf.c \ + math/x86/floorf.S \ + math/x86/fmodf.c \ + math/x86/sinf.c \ + math/x86/tanf.c # Files included in libucrt*.a on x86_64 src_ucrtbase64=\ @@ -735,19 +756,19 @@ src_libmingwex_x86=\ math/cbrtl.c math/erfl.c math/fdiml.c math/fmal.c math/fmaxl.c \ math/fminl.c math/llrintl.c math/llroundl.c math/lrintl.c math/lroundl.c \ math/rintl.c math/roundl.c math/tgammal.c math/truncl.c \ - math/x86/_chgsignl.S math/x86/acosf.c math/x86/acosh.def.h math/x86/acoshl.c math/x86/acosl.c \ - math/x86/asinf.c math/x86/asinhl.c math/x86/asinl.c math/x86/atan2f.c math/x86/atan2l.c \ - math/x86/atanf.c math/x86/atanhl.c math/x86/atanl.c \ - math/x86/ceilf.S math/x86/ceill.S math/x86/copysignl.S \ - math/x86/cos.def.h math/x86/cosf.c math/x86/cosl.c math/x86/cosl_internal.S math/x86/cossin.c \ + math/x86/_chgsignl.S math/x86/acosh.def.h math/x86/acoshl.c math/x86/acosl.c \ + math/x86/asinhl.c math/x86/asinl.c math/x86/atan2l.c \ + math/x86/atanhl.c math/x86/atanl.c \ + math/x86/ceill.S math/x86/copysignl.S \ + math/x86/cos.def.h math/x86/cosl.c math/x86/cosl_internal.S math/x86/cossin.c \ math/x86/exp2l.S math/x86/exp.def.h math/x86/expl.c math/x86/expm1.def.h math/x86/expm1l.c \ - math/x86/fastmath.h math/x86/floorf.S math/x86/floorl.S \ - math/x86/fmodf.c math/x86/fmodl.c math/x86/fucom.c \ + math/x86/fastmath.h math/x86/floorl.S \ + math/x86/fmodl.c math/x86/fucom.c \ math/x86/ilogbl.S math/x86/internal_logl.S math/x86/ldexpl.c \ math/x86/log.def.h math/x86/log10l.S math/x86/log1pl.S math/x86/log2l.S \ math/x86/logbl.c math/x86/logl.c math/x86/nearbyintl.S math/x86/pow.def.h math/x86/powl.c \ math/x86/remainderl.S math/x86/remquol.S math/x86/scalbnl.S math/x86/sin.def.h \ - math/x86/sinf.c math/x86/sinl.c math/x86/sinl_internal.S math/x86/tanf.c math/x86/tanl.S + math/x86/sinl.c math/x86/sinl_internal.S math/x86/tanl.S src_libmingwex32=$(src_libmingwex_x86) 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 e4e5407b9..155182ae7 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 @@ -146,22 +146,22 @@ y1 == _y1 _yn yn == _yn acos -F_NON_I386(acosf F_X86_ANY(DATA)) +F_NON_I386(acosf) F_ARM_ANY(acosl == acos) acosh acoshf acoshl F_X86_ANY(DATA) asin -F_NON_I386(asinf F_X86_ANY(DATA)) +F_NON_I386(asinf) F_ARM_ANY(asinl == asin) asinh asinhf asinhl F_X86_ANY(DATA) atan atan2 -F_NON_I386(atan2f F_X86_ANY(DATA)) +F_NON_I386(atan2f) F_ARM_ANY(atan2l == atan2) -F_NON_I386(atanf F_X86_ANY(DATA)) +F_NON_I386(atanf) F_ARM_ANY(atanl == atan) atanh atanhf @@ -200,7 +200,7 @@ ccoshf ccoshl ccosl ceil -F_NON_I386(ceilf F_X86_ANY(DATA)) +F_NON_I386(ceilf) F_ARM_ANY(ceill == ceil) cexp cexpf @@ -221,7 +221,7 @@ copysign copysignf copysignl F_X86_ANY(DATA) cos -F_NON_I386(cosf F_X86_ANY(DATA)) +F_NON_I386(cosf) F_ARM_ANY(cosl == cos) cosh F_NON_I386(coshf DATA) @@ -270,7 +270,7 @@ fdim fdimf fdiml F_X86_ANY(DATA) floor -F_NON_I386(floorf F_X86_ANY(DATA)) +F_NON_I386(floorf) F_ARM_ANY(floorl == floor) fma fmaf @@ -282,7 +282,7 @@ fmin fminf fminl F_X86_ANY(DATA) fmod -F_NON_I386(fmodf F_X86_ANY(DATA)) +F_NON_I386(fmodf) F_ARM_ANY(fmodl == fmod) frexp hypot @@ -363,7 +363,7 @@ scalbn scalbnf scalbnl F_X86_ANY(DATA) sin -F_NON_I386(sinf F_X86_ANY(DATA)) +F_NON_I386(sinf) F_ARM_ANY(sinl == sin) ; if we implement sinh, we can set it DATA only. sinh @@ -371,7 +371,7 @@ F_NON_I386(sinhf DATA) sqrt F_NON_I386(sqrtf DATA) tan -F_NON_I386(tanf F_X86_ANY(DATA)) +F_NON_I386(tanf) F_ARM_ANY(tanl == tan) ; if we implement tanh, we can set it to DATA only. tanh diff --git a/mingw-w64-crt/lib-common/ucrtbase.def.in b/mingw-w64-crt/lib-common/ucrtbase.def.in index d493280a6..2e4459b7d 100644 --- a/mingw-w64-crt/lib-common/ucrtbase.def.in +++ b/mingw-w64-crt/lib-common/ucrtbase.def.in @@ -2180,7 +2180,7 @@ _yn abort abs acos -F_NON_I386(acosf F_X86_ANY(DATA)) +F_NON_I386(acosf) F_ARM_ANY(acosl == acos) acosh acoshf @@ -2188,16 +2188,16 @@ acoshl F_X86_ANY(DATA) asctime asctime_s asin -F_NON_I386(asinf F_X86_ANY(DATA)) +F_NON_I386(asinf) F_ARM_ANY(asinl == asin) asinh asinhf asinhl F_X86_ANY(DATA) atan atan2 -F_NON_I386(atan2f F_X86_ANY(DATA)) +F_NON_I386(atan2f) F_ARM_ANY(atan2l == atan2) -F_NON_I386(atanf F_X86_ANY(DATA)) +F_NON_I386(atanf) F_ARM_ANY(atanl == atan) atanh atanhf @@ -2246,7 +2246,7 @@ ccoshf ccoshl ccosl ceil -F_NON_I386(ceilf F_X86_ANY(DATA)) +F_NON_I386(ceilf) F_ARM_ANY(ceill == ceil) cexp cexpf @@ -2270,7 +2270,7 @@ copysign copysignf copysignl F_X86_ANY(DATA) cos -F_NON_I386(cosf F_X86_ANY(DATA)) +F_NON_I386(cosf) F_ARM_ANY(cosl == cos) cosh F_NON_I386(coshf DATA) @@ -2342,7 +2342,7 @@ fgets fgetwc fgetws floor -F_NON_I386(floorf F_X86_ANY(DATA)) +F_NON_I386(floorf) F_ARM_ANY(floorl == floor) fma fmaf @@ -2354,7 +2354,7 @@ fmin fminf fminl F_X86_ANY(DATA) fmod -F_NON_I386(fmodf F_X86_ANY(DATA)) +F_NON_I386(fmodf) F_ARM_ANY(fmodl == fmod) fopen fopen_s @@ -2535,7 +2535,7 @@ setlocale setvbuf signal sin -F_NON_I386(sinf F_X86_ANY(DATA)) +F_NON_I386(sinf) F_ARM_ANY(sinl == sin) ; if we implement sinh, we can set it DATA only. sinh @@ -2581,7 +2581,7 @@ strtoumax strxfrm system tan -F_NON_I386(tanf F_X86_ANY(DATA)) +F_NON_I386(tanf) F_ARM_ANY(tanl == tan) ; if we implement tanh, we can set it to DATA only. tanh -- 2.34.1 _______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
