From 26e48102108284d2474f83f5afee56b994c86d54 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 4 Nov 2025 23:41:35 +0000 Subject: [PATCH] Rename fromfp files in preparation for changing types for C23 As discussed in bug 28327, the fromfp functions changed type in C23 (compared to the version in TS 18661-1); they now return the same type as the floating-point argument, instead of intmax_t / uintmax_t. As with other such incompatible changes compared to the initial TS 18661 versions of interfaces (the types of totalorder functions, in particular), it seems appropriate to support only the new version as an API, not the old one (although many programs written for the old API might in fact work wtih the new one as well). Thus, the existing implementations should become compat symbols. They are sufficiently different from how I'd expect to implement the new version that using separate implementations in separate files is more convenient than trying to share code, and directly sharing testcases would be problematic as well. Rename the existing fromfp implementation and test files to names reflecting how they're intended to become compat symbols, so freeing up the existing filenames for a subsequent implementation of the C23 versions of these functions (which is the point at which the existing implementations would actually become compat symbols). gen-fromfp-tests.py and gen-fromfp-tests-inputs are not renamed; I think it will make sense to adapt the test generator to be able to generate most tests for both versions of the functions (with extra test inputs added that are only of interest with the C23 version). The ldbl-opt/nldbl-* files are also not renamed; since those are for a static only library, no compat versions are needed, and they'll just have their contents changed when the C23 version is implemented. Tested for x86_64, and with build-many-glibcs.py. --- math/Makefile | 40 +++++++++---------- math/{fromfp.h => compat_fromfp.h} | 0 ...fromfp.inc => libm-test-compat_fromfp.inc} | 0 ...omfpx.inc => libm-test-compat_fromfpx.inc} | 0 ...romfp.inc => libm-test-compat_ufromfp.inc} | 0 ...mfpx.inc => libm-test-compat_ufromfpx.inc} | 0 .../dbl-64/{s_fromfp.c => s_compat_fromfp.c} | 2 +- ...s_fromfp_main.c => s_compat_fromfp_main.c} | 2 +- .../{s_fromfpx.c => s_compat_fromfpx.c} | 2 +- .../{s_ufromfp.c => s_compat_ufromfp.c} | 2 +- .../{s_ufromfpx.c => s_compat_ufromfpx.c} | 2 +- sysdeps/ieee754/float128/Makefile | 8 ++-- .../{s_fromfpf128.c => s_compat_fromfpf128.c} | 2 +- ...s_fromfpxf128.c => s_compat_fromfpxf128.c} | 2 +- ...s_ufromfpf128.c => s_compat_ufromfpf128.c} | 2 +- ...ufromfpxf128.c => s_compat_ufromfpxf128.c} | 2 +- .../{s_fromfpf.c => s_compat_fromfpf.c} | 2 +- ...fromfpf_main.c => s_compat_fromfpf_main.c} | 2 +- .../{s_fromfpxf.c => s_compat_fromfpxf.c} | 2 +- .../{s_ufromfpf.c => s_compat_ufromfpf.c} | 2 +- .../{s_ufromfpxf.c => s_compat_ufromfpxf.c} | 2 +- sysdeps/ieee754/ldbl-128/Makefile | 8 ++-- .../s_compat_fromfpl.c} | 2 +- ...fromfpl_main.c => s_compat_fromfpl_main.c} | 2 +- .../s_compat_fromfpxl.c} | 2 +- .../s_compat_ufromfpl.c} | 2 +- .../s_compat_ufromfpxl.c} | 2 +- .../{s_fromfpl.c => s_compat_fromfpl.c} | 2 +- ...fromfpl_main.c => s_compat_fromfpl_main.c} | 2 +- .../{s_fromfpxl.c => s_compat_fromfpxl.c} | 2 +- .../{s_ufromfpl.c => s_compat_ufromfpl.c} | 2 +- .../{s_ufromfpxl.c => s_compat_ufromfpxl.c} | 2 +- sysdeps/ieee754/ldbl-96/Makefile | 8 ++-- .../s_compat_fromfpl.c} | 2 +- ...fromfpl_main.c => s_compat_fromfpl_main.c} | 2 +- .../s_compat_fromfpxl.c} | 2 +- .../s_compat_ufromfpl.c} | 2 +- .../s_compat_ufromfpxl.c} | 2 +- .../powerpc64/le/fpu/multiarch/Makefile | 8 ++-- 39 files changed, 65 insertions(+), 65 deletions(-) rename math/{fromfp.h => compat_fromfp.h} (100%) rename math/{libm-test-fromfp.inc => libm-test-compat_fromfp.inc} (100%) rename math/{libm-test-fromfpx.inc => libm-test-compat_fromfpx.inc} (100%) rename math/{libm-test-ufromfp.inc => libm-test-compat_ufromfp.inc} (100%) rename math/{libm-test-ufromfpx.inc => libm-test-compat_ufromfpx.inc} (100%) rename sysdeps/ieee754/dbl-64/{s_fromfp.c => s_compat_fromfp.c} (73%) rename sysdeps/ieee754/dbl-64/{s_fromfp_main.c => s_compat_fromfp_main.c} (98%) rename sysdeps/ieee754/dbl-64/{s_fromfpx.c => s_compat_fromfpx.c} (74%) rename sysdeps/ieee754/dbl-64/{s_ufromfp.c => s_compat_ufromfp.c} (74%) rename sysdeps/ieee754/dbl-64/{s_ufromfpx.c => s_compat_ufromfpx.c} (75%) rename sysdeps/ieee754/float128/{s_fromfpf128.c => s_compat_fromfpf128.c} (73%) rename sysdeps/ieee754/float128/{s_fromfpxf128.c => s_compat_fromfpxf128.c} (74%) rename sysdeps/ieee754/float128/{s_ufromfpf128.c => s_compat_ufromfpf128.c} (74%) rename sysdeps/ieee754/float128/{s_ufromfpxf128.c => s_compat_ufromfpxf128.c} (74%) rename sysdeps/ieee754/flt-32/{s_fromfpf.c => s_compat_fromfpf.c} (73%) rename sysdeps/ieee754/flt-32/{s_fromfpf_main.c => s_compat_fromfpf_main.c} (98%) rename sysdeps/ieee754/flt-32/{s_fromfpxf.c => s_compat_fromfpxf.c} (73%) rename sysdeps/ieee754/flt-32/{s_ufromfpf.c => s_compat_ufromfpf.c} (73%) rename sysdeps/ieee754/flt-32/{s_ufromfpxf.c => s_compat_ufromfpxf.c} (74%) rename sysdeps/ieee754/{ldbl-96/s_fromfpl.c => ldbl-128/s_compat_fromfpl.c} (73%) rename sysdeps/ieee754/ldbl-128/{s_fromfpl_main.c => s_compat_fromfpl_main.c} (98%) rename sysdeps/ieee754/{ldbl-96/s_fromfpxl.c => ldbl-128/s_compat_fromfpxl.c} (74%) rename sysdeps/ieee754/{ldbl-96/s_ufromfpl.c => ldbl-128/s_compat_ufromfpl.c} (74%) rename sysdeps/ieee754/{ldbl-96/s_ufromfpxl.c => ldbl-128/s_compat_ufromfpxl.c} (74%) rename sysdeps/ieee754/ldbl-128ibm/{s_fromfpl.c => s_compat_fromfpl.c} (72%) rename sysdeps/ieee754/ldbl-128ibm/{s_fromfpl_main.c => s_compat_fromfpl_main.c} (99%) rename sysdeps/ieee754/ldbl-128ibm/{s_fromfpxl.c => s_compat_fromfpxl.c} (73%) rename sysdeps/ieee754/ldbl-128ibm/{s_ufromfpl.c => s_compat_ufromfpl.c} (73%) rename sysdeps/ieee754/ldbl-128ibm/{s_ufromfpxl.c => s_compat_ufromfpxl.c} (73%) rename sysdeps/ieee754/{ldbl-128/s_fromfpl.c => ldbl-96/s_compat_fromfpl.c} (73%) rename sysdeps/ieee754/ldbl-96/{s_fromfpl_main.c => s_compat_fromfpl_main.c} (98%) rename sysdeps/ieee754/{ldbl-128/s_fromfpxl.c => ldbl-96/s_compat_fromfpxl.c} (74%) rename sysdeps/ieee754/{ldbl-128/s_ufromfpl.c => ldbl-96/s_compat_ufromfpl.c} (74%) rename sysdeps/ieee754/{ldbl-128/s_ufromfpxl.c => ldbl-96/s_compat_ufromfpxl.c} (74%) diff --git a/math/Makefile b/math/Makefile index 94258d160c2..18909fec157 100644 --- a/math/Makefile +++ b/math/Makefile @@ -209,6 +209,10 @@ libm-calls = \ s_atanF \ s_cbrtF \ s_ceilF \ + s_compat_fromfpF \ + s_compat_fromfpxF \ + s_compat_ufromfpF \ + s_compat_ufromfpxF \ s_cosF \ s_erfF \ s_erfcF \ @@ -217,8 +221,6 @@ libm-calls = \ s_floorF \ s_fmaF \ s_fpclassifyF \ - s_fromfpF \ - s_fromfpxF \ s_getpayloadF \ s_issignalingF \ s_llrintF \ @@ -245,8 +247,6 @@ libm-calls = \ s_totalorderF \ s_totalordermagF \ s_truncF \ - s_ufromfpF \ - s_ufromfpxF \ x2y2m1F \ # libm-calls @@ -719,6 +719,10 @@ libm-test-funcs-noauto-base = \ canonicalize \ ceil \ cimag \ + compat_fromfp \ + compat_fromfpx \ + compat_ufromfp \ + compat_ufromfpx \ conj \ copysign \ cproj \ @@ -741,8 +745,6 @@ libm-test-funcs-noauto-base = \ fmod \ fpclassify \ frexp \ - fromfp \ - fromfpx \ getpayload \ ilogb \ iscanonical \ @@ -787,8 +789,6 @@ libm-test-funcs-noauto-base = \ totalorder \ totalordermag \ trunc \ - ufromfp \ - ufromfpx \ # libm-test-funcs-noauto-base libm-test-funcs-noauto = \ $(libm-test-funcs-noauto-base) \ @@ -1457,8 +1457,8 @@ CFLAGS-s_fminmag.c += -fno-builtin-fminmagl CFLAGS-w_fmod.c += -fno-builtin-fmodl CFLAGS-s_fmul.c += -fno-builtin-fmull CFLAGS-s_frexp.c += -fno-builtin-frexpl -CFLAGS-s_fromfp.c += -fno-builtin-fromfpl -CFLAGS-s_fromfpx.c += -fno-builtin-fromfpxl +CFLAGS-s_compat_fromfp.c += -fno-builtin-fromfpl +CFLAGS-s_compat_fromfpx.c += -fno-builtin-fromfpxl CFLAGS-s_fsqrt.c += -fno-builtin-fsqrtl CFLAGS-s_fsub.c += -fno-builtin-fsubl CFLAGS-s_getpayload.c += -fno-builtin-getpayloadl @@ -1520,8 +1520,8 @@ CFLAGS-w_tgamma.c += -fno-builtin-tgammal CFLAGS-s_totalorder.c += -fno-builtin-totalorderl CFLAGS-s_totalordermag.c += -fno-builtin-totalordermagl CFLAGS-s_trunc.c += -fno-builtin-truncl -CFLAGS-s_ufromfp.c += -fno-builtin-ufromfpl -CFLAGS-s_ufromfpx.c += -fno-builtin-ufromfpxl +CFLAGS-s_compat_ufromfp.c += -fno-builtin-ufromfpl +CFLAGS-s_compat_ufromfpx.c += -fno-builtin-ufromfpxl CFLAGS-s_y0.c += -fno-builtin-y0l CFLAGS-s_y1.c += -fno-builtin-y1l CFLAGS-s_yn.c += -fno-builtin-ynl @@ -1600,8 +1600,8 @@ CFLAGS-s_fminmag.c += -fno-builtin-fminmagf32x -fno-builtin-fminmagf64 CFLAGS-w_fmod.c += -fno-builtin-fmodf32x -fno-builtin-fmodf64 CFLAGS-s_fmul.c += -fno-builtin-f32mulf32x -fno-builtin-f32mulf64 CFLAGS-s_frexp.c += -fno-builtin-frexpf32x -fno-builtin-frexpf64 -CFLAGS-s_fromfp.c += -fno-builtin-fromfpf32x -fno-builtin-fromfpf64 -CFLAGS-s_fromfpx.c += -fno-builtin-fromfpxf32x -fno-builtin-fromfpxf64 +CFLAGS-s_compat_fromfp.c += -fno-builtin-fromfpf32x -fno-builtin-fromfpf64 +CFLAGS-s_compat_fromfpx.c += -fno-builtin-fromfpxf32x -fno-builtin-fromfpxf64 CFLAGS-s_fsqrt.c += -fno-builtin-f32sqrtf32x -fno-builtin-f32sqrtf64 CFLAGS-s_fsub.c += -fno-builtin-f32subf32x -fno-builtin-f32subf64 CFLAGS-s_getpayload.c += -fno-builtin-getpayloadf32x -fno-builtin-getpayloadf64 @@ -1657,8 +1657,8 @@ CFLAGS-w_tgamma.c += -fno-builtin-tgammaf32x -fno-builtin-tgammaf64 CFLAGS-s_totalorder.c += -fno-builtin-totalorderf32x -fno-builtin-totalorderf64 CFLAGS-s_totalordermag.c += -fno-builtin-totalordermagf32x -fno-builtin-totalordermagf64 CFLAGS-s_trunc.c += -fno-builtin-truncf32x -fno-builtin-truncf64 -CFLAGS-s_ufromfp.c += -fno-builtin-ufromfpf32x -fno-builtin-ufromfpf64 -CFLAGS-s_ufromfpx.c += -fno-builtin-ufromfpxf32x -fno-builtin-ufromfpxf64 +CFLAGS-s_compat_ufromfp.c += -fno-builtin-ufromfpf32x -fno-builtin-ufromfpf64 +CFLAGS-s_compat_ufromfpx.c += -fno-builtin-ufromfpxf32x -fno-builtin-ufromfpxf64 CFLAGS-s_y0.c += -fno-builtin-y0f32x -fno-builtin-y0f64 CFLAGS-s_y1.c += -fno-builtin-y1f32x -fno-builtin-y1f64 CFLAGS-s_yn.c += -fno-builtin-ynf32x -fno-builtin-ynf64 @@ -1732,8 +1732,8 @@ CFLAGS-s_fminimum_numf.c += -fno-builtin-fminimum_numf32 CFLAGS-s_fminmagf.c += -fno-builtin-fminmagf32 CFLAGS-w_fmodf.c += -fno-builtin-fmodf32 CFLAGS-s_frexpf.c += -fno-builtin-frexpf32 -CFLAGS-s_fromfpf.c += -fno-builtin-fromfpf32 -CFLAGS-s_fromfpxf.c += -fno-builtin-fromfpxf32 +CFLAGS-s_compat_fromfpf.c += -fno-builtin-fromfpf32 +CFLAGS-s_compat_fromfpxf.c += -fno-builtin-fromfpxf32 CFLAGS-s_getpayloadf.c += -fno-builtin-getpayloadf32 CFLAGS-w_hypotf.c += -fno-builtin-hypotf32 CFLAGS-w_ilogbf.c += -fno-builtin-ilogbf32 @@ -1787,8 +1787,8 @@ CFLAGS-w_tgammaf.c += -fno-builtin-tgammaf32 CFLAGS-s_totalorderf.c += -fno-builtin-totalorderf32 CFLAGS-s_totalordermagf.c += -fno-builtin-totalordermagf32 CFLAGS-s_truncf.c += -fno-builtin-truncf32 -CFLAGS-s_ufromfpf.c += -fno-builtin-ufromfpf32 -CFLAGS-s_ufromfpxf.c += -fno-builtin-ufromfpxf32 +CFLAGS-s_compat_ufromfpf.c += -fno-builtin-ufromfpf32 +CFLAGS-s_compat_ufromfpxf.c += -fno-builtin-ufromfpxf32 CFLAGS-s_y0f.c += -fno-builtin-y0f32 CFLAGS-s_y1f.c += -fno-builtin-y1f32 CFLAGS-s_ynf.c += -fno-builtin-ynf32 diff --git a/math/fromfp.h b/math/compat_fromfp.h similarity index 100% rename from math/fromfp.h rename to math/compat_fromfp.h diff --git a/math/libm-test-fromfp.inc b/math/libm-test-compat_fromfp.inc similarity index 100% rename from math/libm-test-fromfp.inc rename to math/libm-test-compat_fromfp.inc diff --git a/math/libm-test-fromfpx.inc b/math/libm-test-compat_fromfpx.inc similarity index 100% rename from math/libm-test-fromfpx.inc rename to math/libm-test-compat_fromfpx.inc diff --git a/math/libm-test-ufromfp.inc b/math/libm-test-compat_ufromfp.inc similarity index 100% rename from math/libm-test-ufromfp.inc rename to math/libm-test-compat_ufromfp.inc diff --git a/math/libm-test-ufromfpx.inc b/math/libm-test-compat_ufromfpx.inc similarity index 100% rename from math/libm-test-ufromfpx.inc rename to math/libm-test-compat_ufromfpx.inc diff --git a/sysdeps/ieee754/dbl-64/s_fromfp.c b/sysdeps/ieee754/dbl-64/s_compat_fromfp.c similarity index 73% rename from sysdeps/ieee754/dbl-64/s_fromfp.c rename to sysdeps/ieee754/dbl-64/s_compat_fromfp.c index 30572b2a9be..d159d62fe60 100644 --- a/sysdeps/ieee754/dbl-64/s_fromfp.c +++ b/sysdeps/ieee754/dbl-64/s_compat_fromfp.c @@ -1,5 +1,5 @@ #define UNSIGNED 0 #define INEXACT 0 #define FUNC __fromfp -#include +#include libm_alias_double (__fromfp, fromfp) diff --git a/sysdeps/ieee754/dbl-64/s_fromfp_main.c b/sysdeps/ieee754/dbl-64/s_compat_fromfp_main.c similarity index 98% rename from sysdeps/ieee754/dbl-64/s_fromfp_main.c rename to sysdeps/ieee754/dbl-64/s_compat_fromfp_main.c index 294bee2c04c..17e8ded49e9 100644 --- a/sysdeps/ieee754/dbl-64/s_fromfp_main.c +++ b/sysdeps/ieee754/dbl-64/s_compat_fromfp_main.c @@ -33,7 +33,7 @@ # define RET_TYPE intmax_t #endif -#include +#include RET_TYPE FUNC (double x, int round, unsigned int width) diff --git a/sysdeps/ieee754/dbl-64/s_fromfpx.c b/sysdeps/ieee754/dbl-64/s_compat_fromfpx.c similarity index 74% rename from sysdeps/ieee754/dbl-64/s_fromfpx.c rename to sysdeps/ieee754/dbl-64/s_compat_fromfpx.c index b7a0d59a050..b90fdea3512 100644 --- a/sysdeps/ieee754/dbl-64/s_fromfpx.c +++ b/sysdeps/ieee754/dbl-64/s_compat_fromfpx.c @@ -1,5 +1,5 @@ #define UNSIGNED 0 #define INEXACT 1 #define FUNC __fromfpx -#include +#include libm_alias_double (__fromfpx, fromfpx) diff --git a/sysdeps/ieee754/dbl-64/s_ufromfp.c b/sysdeps/ieee754/dbl-64/s_compat_ufromfp.c similarity index 74% rename from sysdeps/ieee754/dbl-64/s_ufromfp.c rename to sysdeps/ieee754/dbl-64/s_compat_ufromfp.c index 2532215981d..4a8312b8811 100644 --- a/sysdeps/ieee754/dbl-64/s_ufromfp.c +++ b/sysdeps/ieee754/dbl-64/s_compat_ufromfp.c @@ -1,5 +1,5 @@ #define UNSIGNED 1 #define INEXACT 0 #define FUNC __ufromfp -#include +#include libm_alias_double (__ufromfp, ufromfp) diff --git a/sysdeps/ieee754/dbl-64/s_ufromfpx.c b/sysdeps/ieee754/dbl-64/s_compat_ufromfpx.c similarity index 75% rename from sysdeps/ieee754/dbl-64/s_ufromfpx.c rename to sysdeps/ieee754/dbl-64/s_compat_ufromfpx.c index 0945dfce083..50de6de29cb 100644 --- a/sysdeps/ieee754/dbl-64/s_ufromfpx.c +++ b/sysdeps/ieee754/dbl-64/s_compat_ufromfpx.c @@ -1,5 +1,5 @@ #define UNSIGNED 1 #define INEXACT 1 #define FUNC __ufromfpx -#include +#include libm_alias_double (__ufromfpx, ufromfpx) diff --git a/sysdeps/ieee754/float128/Makefile b/sysdeps/ieee754/float128/Makefile index f0f6aae6ae1..faeeb80b2b6 100644 --- a/sysdeps/ieee754/float128/Makefile +++ b/sysdeps/ieee754/float128/Makefile @@ -82,8 +82,8 @@ CFLAGS-s_fminmagf128.c += -fno-builtin-fminmagf64x CFLAGS-w_fmodf128.c += -fno-builtin-fmodf64x CFLAGS-s_fmulf128.c += -fno-builtin-f32mulf64x CFLAGS-s_frexpf128.c += -fno-builtin-frexpf64x -CFLAGS-s_fromfpf128.c += -fno-builtin-fromfpf64x -CFLAGS-s_fromfpxf128.c += -fno-builtin-fromfpxf64x +CFLAGS-s_compat_fromfpf128.c += -fno-builtin-fromfpf64x +CFLAGS-s_compat_fromfpxf128.c += -fno-builtin-fromfpxf64x CFLAGS-s_fsqrtf128.c += -fno-builtin-f32sqrtf64x CFLAGS-s_fsubf128.c += -fno-builtin-f32subf64x CFLAGS-s_getpayloadf128.c += -fno-builtin-getpayloadf64x @@ -131,8 +131,8 @@ CFLAGS-w_tgammaf128.c += -fno-builtin-tgammaf64x CFLAGS-s_totalorderf128.c += -fno-builtin-totalorderf64x CFLAGS-s_totalordermagf128.c += -fno-builtin-totalordermagf64x CFLAGS-s_truncf128.c += -fno-builtin-truncf64x -CFLAGS-s_ufromfpf128.c += -fno-builtin-ufromfpf64x -CFLAGS-s_ufromfpxf128.c += -fno-builtin-ufromfpxf64x +CFLAGS-s_compat_ufromfpf128.c += -fno-builtin-ufromfpf64x +CFLAGS-s_compat_ufromfpxf128.c += -fno-builtin-ufromfpxf64x CFLAGS-s_y0f128.c += -fno-builtin-y0f64x CFLAGS-s_y1f128.c += -fno-builtin-y1f64x CFLAGS-s_ynf128.c += -fno-builtin-ynf64x diff --git a/sysdeps/ieee754/float128/s_fromfpf128.c b/sysdeps/ieee754/float128/s_compat_fromfpf128.c similarity index 73% rename from sysdeps/ieee754/float128/s_fromfpf128.c rename to sysdeps/ieee754/float128/s_compat_fromfpf128.c index 86adf3821e5..3cb1bfe6fb4 100644 --- a/sysdeps/ieee754/float128/s_fromfpf128.c +++ b/sysdeps/ieee754/float128/s_compat_fromfpf128.c @@ -2,5 +2,5 @@ #define INEXACT 0 #define FUNC __fromfpf128 #include -#include "../ldbl-128/s_fromfpl_main.c" +#include "../ldbl-128/s_compat_fromfpl_main.c" libm_alias_float128 (__fromfp, fromfp) diff --git a/sysdeps/ieee754/float128/s_fromfpxf128.c b/sysdeps/ieee754/float128/s_compat_fromfpxf128.c similarity index 74% rename from sysdeps/ieee754/float128/s_fromfpxf128.c rename to sysdeps/ieee754/float128/s_compat_fromfpxf128.c index c56422381fa..dc58fccd3e8 100644 --- a/sysdeps/ieee754/float128/s_fromfpxf128.c +++ b/sysdeps/ieee754/float128/s_compat_fromfpxf128.c @@ -2,5 +2,5 @@ #define INEXACT 1 #define FUNC __fromfpxf128 #include -#include "../ldbl-128/s_fromfpl_main.c" +#include "../ldbl-128/s_compat_fromfpl_main.c" libm_alias_float128 (__fromfpx, fromfpx) diff --git a/sysdeps/ieee754/float128/s_ufromfpf128.c b/sysdeps/ieee754/float128/s_compat_ufromfpf128.c similarity index 74% rename from sysdeps/ieee754/float128/s_ufromfpf128.c rename to sysdeps/ieee754/float128/s_compat_ufromfpf128.c index 0e6521f5870..c9e3fb02d54 100644 --- a/sysdeps/ieee754/float128/s_ufromfpf128.c +++ b/sysdeps/ieee754/float128/s_compat_ufromfpf128.c @@ -2,5 +2,5 @@ #define INEXACT 0 #define FUNC __ufromfpf128 #include -#include "../ldbl-128/s_fromfpl_main.c" +#include "../ldbl-128/s_compat_fromfpl_main.c" libm_alias_float128 (__ufromfp, ufromfp) diff --git a/sysdeps/ieee754/float128/s_ufromfpxf128.c b/sysdeps/ieee754/float128/s_compat_ufromfpxf128.c similarity index 74% rename from sysdeps/ieee754/float128/s_ufromfpxf128.c rename to sysdeps/ieee754/float128/s_compat_ufromfpxf128.c index cd192b73bf4..ffda04d5e3e 100644 --- a/sysdeps/ieee754/float128/s_ufromfpxf128.c +++ b/sysdeps/ieee754/float128/s_compat_ufromfpxf128.c @@ -2,5 +2,5 @@ #define INEXACT 1 #define FUNC __ufromfpxf128 #include -#include "../ldbl-128/s_fromfpl_main.c" +#include "../ldbl-128/s_compat_fromfpl_main.c" libm_alias_float128 (__ufromfpx, ufromfpx) diff --git a/sysdeps/ieee754/flt-32/s_fromfpf.c b/sysdeps/ieee754/flt-32/s_compat_fromfpf.c similarity index 73% rename from sysdeps/ieee754/flt-32/s_fromfpf.c rename to sysdeps/ieee754/flt-32/s_compat_fromfpf.c index d0c83b8f5d4..666422ea61c 100644 --- a/sysdeps/ieee754/flt-32/s_fromfpf.c +++ b/sysdeps/ieee754/flt-32/s_compat_fromfpf.c @@ -1,5 +1,5 @@ #define UNSIGNED 0 #define INEXACT 0 #define FUNC __fromfpf -#include +#include libm_alias_float (__fromfp, fromfp) diff --git a/sysdeps/ieee754/flt-32/s_fromfpf_main.c b/sysdeps/ieee754/flt-32/s_compat_fromfpf_main.c similarity index 98% rename from sysdeps/ieee754/flt-32/s_fromfpf_main.c rename to sysdeps/ieee754/flt-32/s_compat_fromfpf_main.c index 72906038cc7..968d8837a1e 100644 --- a/sysdeps/ieee754/flt-32/s_fromfpf_main.c +++ b/sysdeps/ieee754/flt-32/s_compat_fromfpf_main.c @@ -33,7 +33,7 @@ # define RET_TYPE intmax_t #endif -#include +#include RET_TYPE FUNC (float x, int round, unsigned int width) diff --git a/sysdeps/ieee754/flt-32/s_fromfpxf.c b/sysdeps/ieee754/flt-32/s_compat_fromfpxf.c similarity index 73% rename from sysdeps/ieee754/flt-32/s_fromfpxf.c rename to sysdeps/ieee754/flt-32/s_compat_fromfpxf.c index 01d9247c31e..0be126723be 100644 --- a/sysdeps/ieee754/flt-32/s_fromfpxf.c +++ b/sysdeps/ieee754/flt-32/s_compat_fromfpxf.c @@ -1,5 +1,5 @@ #define UNSIGNED 0 #define INEXACT 1 #define FUNC __fromfpxf -#include +#include libm_alias_float (__fromfpx, fromfpx) diff --git a/sysdeps/ieee754/flt-32/s_ufromfpf.c b/sysdeps/ieee754/flt-32/s_compat_ufromfpf.c similarity index 73% rename from sysdeps/ieee754/flt-32/s_ufromfpf.c rename to sysdeps/ieee754/flt-32/s_compat_ufromfpf.c index 0d2b4493a8d..5a4c59d28ce 100644 --- a/sysdeps/ieee754/flt-32/s_ufromfpf.c +++ b/sysdeps/ieee754/flt-32/s_compat_ufromfpf.c @@ -1,5 +1,5 @@ #define UNSIGNED 1 #define INEXACT 0 #define FUNC __ufromfpf -#include +#include libm_alias_float (__ufromfp, ufromfp) diff --git a/sysdeps/ieee754/flt-32/s_ufromfpxf.c b/sysdeps/ieee754/flt-32/s_compat_ufromfpxf.c similarity index 74% rename from sysdeps/ieee754/flt-32/s_ufromfpxf.c rename to sysdeps/ieee754/flt-32/s_compat_ufromfpxf.c index 81f56daf9d8..1e7310ea878 100644 --- a/sysdeps/ieee754/flt-32/s_ufromfpxf.c +++ b/sysdeps/ieee754/flt-32/s_compat_ufromfpxf.c @@ -1,5 +1,5 @@ #define UNSIGNED 1 #define INEXACT 1 #define FUNC __ufromfpxf -#include +#include libm_alias_float (__ufromfpx, ufromfpx) diff --git a/sysdeps/ieee754/ldbl-128/Makefile b/sysdeps/ieee754/ldbl-128/Makefile index e666bdc6a89..e0f1a6730cc 100644 --- a/sysdeps/ieee754/ldbl-128/Makefile +++ b/sysdeps/ieee754/ldbl-128/Makefile @@ -71,8 +71,8 @@ CFLAGS-s_fminmagl.c += -fno-builtin-fminmagf64x -fno-builtin-fminmagf128 CFLAGS-w_fmodl.c += -fno-builtin-fmodf64x -fno-builtin-fmodf128 CFLAGS-s_fmull.c += -fno-builtin-f32mulf64x -fno-builtin-f32mulf128 CFLAGS-s_frexpl.c += -fno-builtin-frexpf64x -fno-builtin-frexpf128 -CFLAGS-s_fromfpl.c += -fno-builtin-fromfpf64x -fno-builtin-fromfpf128 -CFLAGS-s_fromfpxl.c += -fno-builtin-fromfpxf64x -fno-builtin-fromfpxf128 +CFLAGS-s_compat_fromfpl.c += -fno-builtin-fromfpf64x -fno-builtin-fromfpf128 +CFLAGS-s_compat_fromfpxl.c += -fno-builtin-fromfpxf64x -fno-builtin-fromfpxf128 CFLAGS-s_fsqrtl.c += -fno-builtin-f32sqrtf64x -fno-builtin-f32sqrtf128 CFLAGS-s_fsubl.c += -fno-builtin-f32subf64x -fno-builtin-f32subf128 CFLAGS-s_getpayloadl.c += -fno-builtin-getpayloadf64x -fno-builtin-getpayloadf128 @@ -120,8 +120,8 @@ CFLAGS-w_tgammal.c += -fno-builtin-tgammaf64x -fno-builtin-tgammaf128 CFLAGS-s_totalorderl.c += -fno-builtin-totalorderf64x -fno-builtin-totalorderf128 CFLAGS-s_totalordermagl.c += -fno-builtin-totalordermagf64x -fno-builtin-totalordermagf128 CFLAGS-s_truncl.c += -fno-builtin-truncf64x -fno-builtin-truncf128 -CFLAGS-s_ufromfpl.c += -fno-builtin-ufromfpf64x -fno-builtin-ufromfpf128 -CFLAGS-s_ufromfpxl.c += -fno-builtin-ufromfpxf64x -fno-builtin-ufromfpxf128 +CFLAGS-s_compat_ufromfpl.c += -fno-builtin-ufromfpf64x -fno-builtin-ufromfpf128 +CFLAGS-s_compat_ufromfpxl.c += -fno-builtin-ufromfpxf64x -fno-builtin-ufromfpxf128 CFLAGS-s_y0l.c += -fno-builtin-y0f64x -fno-builtin-y0f128 CFLAGS-s_y1l.c += -fno-builtin-y1f64x -fno-builtin-y1f128 CFLAGS-s_ynl.c += -fno-builtin-ynf64x -fno-builtin-ynf128 diff --git a/sysdeps/ieee754/ldbl-96/s_fromfpl.c b/sysdeps/ieee754/ldbl-128/s_compat_fromfpl.c similarity index 73% rename from sysdeps/ieee754/ldbl-96/s_fromfpl.c rename to sysdeps/ieee754/ldbl-128/s_compat_fromfpl.c index bcedceea8e2..c1cc75138ff 100644 --- a/sysdeps/ieee754/ldbl-96/s_fromfpl.c +++ b/sysdeps/ieee754/ldbl-128/s_compat_fromfpl.c @@ -1,5 +1,5 @@ #define UNSIGNED 0 #define INEXACT 0 #define FUNC __fromfpl -#include +#include libm_alias_ldouble (__fromfp, fromfp) diff --git a/sysdeps/ieee754/ldbl-128/s_fromfpl_main.c b/sysdeps/ieee754/ldbl-128/s_compat_fromfpl_main.c similarity index 98% rename from sysdeps/ieee754/ldbl-128/s_fromfpl_main.c rename to sysdeps/ieee754/ldbl-128/s_compat_fromfpl_main.c index 235e3ceb080..529839449bc 100644 --- a/sysdeps/ieee754/ldbl-128/s_fromfpl_main.c +++ b/sysdeps/ieee754/ldbl-128/s_compat_fromfpl_main.c @@ -33,7 +33,7 @@ # define RET_TYPE intmax_t #endif -#include +#include RET_TYPE FUNC (_Float128 x, int round, unsigned int width) diff --git a/sysdeps/ieee754/ldbl-96/s_fromfpxl.c b/sysdeps/ieee754/ldbl-128/s_compat_fromfpxl.c similarity index 74% rename from sysdeps/ieee754/ldbl-96/s_fromfpxl.c rename to sysdeps/ieee754/ldbl-128/s_compat_fromfpxl.c index 0a342a22d1b..c10f6a3f5ab 100644 --- a/sysdeps/ieee754/ldbl-96/s_fromfpxl.c +++ b/sysdeps/ieee754/ldbl-128/s_compat_fromfpxl.c @@ -1,5 +1,5 @@ #define UNSIGNED 0 #define INEXACT 1 #define FUNC __fromfpxl -#include +#include libm_alias_ldouble (__fromfpx, fromfpx) diff --git a/sysdeps/ieee754/ldbl-96/s_ufromfpl.c b/sysdeps/ieee754/ldbl-128/s_compat_ufromfpl.c similarity index 74% rename from sysdeps/ieee754/ldbl-96/s_ufromfpl.c rename to sysdeps/ieee754/ldbl-128/s_compat_ufromfpl.c index 22935e6ef7c..27e9aca9df7 100644 --- a/sysdeps/ieee754/ldbl-96/s_ufromfpl.c +++ b/sysdeps/ieee754/ldbl-128/s_compat_ufromfpl.c @@ -1,5 +1,5 @@ #define UNSIGNED 1 #define INEXACT 0 #define FUNC __ufromfpl -#include +#include libm_alias_ldouble (__ufromfp, ufromfp) diff --git a/sysdeps/ieee754/ldbl-96/s_ufromfpxl.c b/sysdeps/ieee754/ldbl-128/s_compat_ufromfpxl.c similarity index 74% rename from sysdeps/ieee754/ldbl-96/s_ufromfpxl.c rename to sysdeps/ieee754/ldbl-128/s_compat_ufromfpxl.c index 77a5423de89..f5222fed1ac 100644 --- a/sysdeps/ieee754/ldbl-96/s_ufromfpxl.c +++ b/sysdeps/ieee754/ldbl-128/s_compat_ufromfpxl.c @@ -1,5 +1,5 @@ #define UNSIGNED 1 #define INEXACT 1 #define FUNC __ufromfpxl -#include +#include libm_alias_ldouble (__ufromfpx, ufromfpx) diff --git a/sysdeps/ieee754/ldbl-128ibm/s_fromfpl.c b/sysdeps/ieee754/ldbl-128ibm/s_compat_fromfpl.c similarity index 72% rename from sysdeps/ieee754/ldbl-128ibm/s_fromfpl.c rename to sysdeps/ieee754/ldbl-128ibm/s_compat_fromfpl.c index f3fdba33c1c..844f86363b3 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_fromfpl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_compat_fromfpl.c @@ -1,5 +1,5 @@ #define UNSIGNED 0 #define INEXACT 0 #define FUNC __fromfpl -#include +#include weak_alias (__fromfpl, fromfpl) diff --git a/sysdeps/ieee754/ldbl-128ibm/s_fromfpl_main.c b/sysdeps/ieee754/ldbl-128ibm/s_compat_fromfpl_main.c similarity index 99% rename from sysdeps/ieee754/ldbl-128ibm/s_fromfpl_main.c rename to sysdeps/ieee754/ldbl-128ibm/s_compat_fromfpl_main.c index 8c51f472727..83178b58e77 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_fromfpl_main.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_compat_fromfpl_main.c @@ -32,7 +32,7 @@ # define RET_TYPE intmax_t #endif -#include +#include RET_TYPE FUNC (long double x, int round, unsigned int width) diff --git a/sysdeps/ieee754/ldbl-128ibm/s_fromfpxl.c b/sysdeps/ieee754/ldbl-128ibm/s_compat_fromfpxl.c similarity index 73% rename from sysdeps/ieee754/ldbl-128ibm/s_fromfpxl.c rename to sysdeps/ieee754/ldbl-128ibm/s_compat_fromfpxl.c index 9477cc2ea75..8117dce3d00 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_fromfpxl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_compat_fromfpxl.c @@ -1,5 +1,5 @@ #define UNSIGNED 0 #define INEXACT 1 #define FUNC __fromfpxl -#include +#include weak_alias (__fromfpxl, fromfpxl) diff --git a/sysdeps/ieee754/ldbl-128ibm/s_ufromfpl.c b/sysdeps/ieee754/ldbl-128ibm/s_compat_ufromfpl.c similarity index 73% rename from sysdeps/ieee754/ldbl-128ibm/s_ufromfpl.c rename to sysdeps/ieee754/ldbl-128ibm/s_compat_ufromfpl.c index 2176aa0cdd1..e42417744db 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_ufromfpl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_compat_ufromfpl.c @@ -1,5 +1,5 @@ #define UNSIGNED 1 #define INEXACT 0 #define FUNC __ufromfpl -#include +#include weak_alias (__ufromfpl, ufromfpl) diff --git a/sysdeps/ieee754/ldbl-128ibm/s_ufromfpxl.c b/sysdeps/ieee754/ldbl-128ibm/s_compat_ufromfpxl.c similarity index 73% rename from sysdeps/ieee754/ldbl-128ibm/s_ufromfpxl.c rename to sysdeps/ieee754/ldbl-128ibm/s_compat_ufromfpxl.c index 29011513125..a21f548af03 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_ufromfpxl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_compat_ufromfpxl.c @@ -1,5 +1,5 @@ #define UNSIGNED 1 #define INEXACT 1 #define FUNC __ufromfpxl -#include +#include weak_alias (__ufromfpxl, ufromfpxl) diff --git a/sysdeps/ieee754/ldbl-96/Makefile b/sysdeps/ieee754/ldbl-96/Makefile index 833f3b7d898..72b93227716 100644 --- a/sysdeps/ieee754/ldbl-96/Makefile +++ b/sysdeps/ieee754/ldbl-96/Makefile @@ -92,8 +92,8 @@ CFLAGS-s_fminmagl.c += -fno-builtin-fminmagf64x CFLAGS-w_fmodl.c += -fno-builtin-fmodf64x CFLAGS-s_fmull.c += -fno-builtin-f32mulf64x CFLAGS-s_frexpl.c += -fno-builtin-frexpf64x -CFLAGS-s_fromfpl.c += -fno-builtin-fromfpf64x -CFLAGS-s_fromfpxl.c += -fno-builtin-fromfpxf64x +CFLAGS-s_compat_fromfpl.c += -fno-builtin-fromfpf64x +CFLAGS-s_compat_fromfpxl.c += -fno-builtin-fromfpxf64x CFLAGS-s_fsqrtl.c += -fno-builtin-f32sqrtf64x CFLAGS-s_fsubl.c += -fno-builtin-f32subf64x CFLAGS-s_getpayloadl.c += -fno-builtin-getpayloadf64x @@ -141,8 +141,8 @@ CFLAGS-w_tgammal.c += -fno-builtin-tgammaf64x CFLAGS-s_totalorderl.c += -fno-builtin-totalorderf64x CFLAGS-s_totalordermagl.c += -fno-builtin-totalordermagf64x CFLAGS-s_truncl.c += -fno-builtin-truncf64x -CFLAGS-s_ufromfpl.c += -fno-builtin-ufromfpf64x -CFLAGS-s_ufromfpxl.c += -fno-builtin-ufromfpxf64x +CFLAGS-s_compat_ufromfpl.c += -fno-builtin-ufromfpf64x +CFLAGS-s_compat_ufromfpxl.c += -fno-builtin-ufromfpxf64x CFLAGS-s_y0l.c += -fno-builtin-y0f64x CFLAGS-s_y1l.c += -fno-builtin-y1f64x CFLAGS-s_ynl.c += -fno-builtin-ynf64x diff --git a/sysdeps/ieee754/ldbl-128/s_fromfpl.c b/sysdeps/ieee754/ldbl-96/s_compat_fromfpl.c similarity index 73% rename from sysdeps/ieee754/ldbl-128/s_fromfpl.c rename to sysdeps/ieee754/ldbl-96/s_compat_fromfpl.c index bcedceea8e2..c1cc75138ff 100644 --- a/sysdeps/ieee754/ldbl-128/s_fromfpl.c +++ b/sysdeps/ieee754/ldbl-96/s_compat_fromfpl.c @@ -1,5 +1,5 @@ #define UNSIGNED 0 #define INEXACT 0 #define FUNC __fromfpl -#include +#include libm_alias_ldouble (__fromfp, fromfp) diff --git a/sysdeps/ieee754/ldbl-96/s_fromfpl_main.c b/sysdeps/ieee754/ldbl-96/s_compat_fromfpl_main.c similarity index 98% rename from sysdeps/ieee754/ldbl-96/s_fromfpl_main.c rename to sysdeps/ieee754/ldbl-96/s_compat_fromfpl_main.c index dfbf9a4700e..5abac57cef2 100644 --- a/sysdeps/ieee754/ldbl-96/s_fromfpl_main.c +++ b/sysdeps/ieee754/ldbl-96/s_compat_fromfpl_main.c @@ -33,7 +33,7 @@ # define RET_TYPE intmax_t #endif -#include +#include RET_TYPE FUNC (long double x, int round, unsigned int width) diff --git a/sysdeps/ieee754/ldbl-128/s_fromfpxl.c b/sysdeps/ieee754/ldbl-96/s_compat_fromfpxl.c similarity index 74% rename from sysdeps/ieee754/ldbl-128/s_fromfpxl.c rename to sysdeps/ieee754/ldbl-96/s_compat_fromfpxl.c index 0a342a22d1b..c10f6a3f5ab 100644 --- a/sysdeps/ieee754/ldbl-128/s_fromfpxl.c +++ b/sysdeps/ieee754/ldbl-96/s_compat_fromfpxl.c @@ -1,5 +1,5 @@ #define UNSIGNED 0 #define INEXACT 1 #define FUNC __fromfpxl -#include +#include libm_alias_ldouble (__fromfpx, fromfpx) diff --git a/sysdeps/ieee754/ldbl-128/s_ufromfpl.c b/sysdeps/ieee754/ldbl-96/s_compat_ufromfpl.c similarity index 74% rename from sysdeps/ieee754/ldbl-128/s_ufromfpl.c rename to sysdeps/ieee754/ldbl-96/s_compat_ufromfpl.c index 22935e6ef7c..27e9aca9df7 100644 --- a/sysdeps/ieee754/ldbl-128/s_ufromfpl.c +++ b/sysdeps/ieee754/ldbl-96/s_compat_ufromfpl.c @@ -1,5 +1,5 @@ #define UNSIGNED 1 #define INEXACT 0 #define FUNC __ufromfpl -#include +#include libm_alias_ldouble (__ufromfp, ufromfp) diff --git a/sysdeps/ieee754/ldbl-128/s_ufromfpxl.c b/sysdeps/ieee754/ldbl-96/s_compat_ufromfpxl.c similarity index 74% rename from sysdeps/ieee754/ldbl-128/s_ufromfpxl.c rename to sysdeps/ieee754/ldbl-96/s_compat_ufromfpxl.c index 77a5423de89..f5222fed1ac 100644 --- a/sysdeps/ieee754/ldbl-128/s_ufromfpxl.c +++ b/sysdeps/ieee754/ldbl-96/s_compat_ufromfpxl.c @@ -1,5 +1,5 @@ #define UNSIGNED 1 #define INEXACT 1 #define FUNC __ufromfpxl -#include +#include libm_alias_ldouble (__ufromfpx, ufromfpx) diff --git a/sysdeps/powerpc/powerpc64/le/fpu/multiarch/Makefile b/sysdeps/powerpc/powerpc64/le/fpu/multiarch/Makefile index 1a0e496d41c..083a4d3eeb1 100644 --- a/sysdeps/powerpc/powerpc64/le/fpu/multiarch/Makefile +++ b/sysdeps/powerpc/powerpc64/le/fpu/multiarch/Makefile @@ -281,8 +281,8 @@ CFLAGS-s_fminmagf128-ifunc.c += -fno-builtin-fminmagf64x CFLAGS-w_fmodf128-ifunc.c += -fno-builtin-fmodf64x CFLAGS-s_fmulf128-ifunc.c += -fno-builtin-f32mulf64x CFLAGS-s_frexpf128-ifunc.c += -fno-builtin-frexpf64x -CFLAGS-s_fromfpf128-ifunc.c += -fno-builtin-fromfpf64x -CFLAGS-s_fromfpxf128-ifunc.c += -fno-builtin-fromfpxf64x +CFLAGS-s_compat_fromfpf128-ifunc.c += -fno-builtin-fromfpf64x +CFLAGS-s_compat_fromfpxf128-ifunc.c += -fno-builtin-fromfpxf64x CFLAGS-s_fsqrtf128-ifunc.c += -fno-builtin-f32sqrtf64x CFLAGS-s_fsubf128-ifunc.c += -fno-builtin-f32subf64x CFLAGS-s_getpayloadf128-ifunc.c += -fno-builtin-getpayloadf64x @@ -330,8 +330,8 @@ CFLAGS-w_tgammaf128-ifunc.c += -fno-builtin-tgammaf64x CFLAGS-s_totalorderf128-ifunc.c += -fno-builtin-totalorderf64x CFLAGS-s_totalordermagf128-ifunc.c += -fno-builtin-totalordermagf64x CFLAGS-s_truncf128-ifunc.c += -fno-builtin-truncf64x -CFLAGS-s_ufromfpf128-ifunc.c += -fno-builtin-ufromfpf64x -CFLAGS-s_ufromfpxf128-ifunc.c += -fno-builtin-ufromfpxf64x +CFLAGS-s_compat_ufromfpf128-ifunc.c += -fno-builtin-ufromfpf64x +CFLAGS-s_compat_ufromfpxf128-ifunc.c += -fno-builtin-ufromfpxf64x CFLAGS-s_y0f128-ifunc.c += -fno-builtin-y0f64x CFLAGS-s_y1f128-ifunc.c += -fno-builtin-y1f64x CFLAGS-s_ynf128-ifunc.c += -fno-builtin-ynf64x -- 2.47.3