From 3789e2fd9d2eef1bf39820df584acab670183905 Mon Sep 17 00:00:00 2001 From: "Gabriel F. T. Gomes" Date: Wed, 8 Feb 2017 20:44:34 -0200 Subject: Merge libm-compat-calls-auto and libm-compat-calls Both libm-compat-calls and libm-compat-calls-auto list the functions that must be built for the types float, double, and long double, but not for other floating-point types that get added to libm. Besides that, the use of libm-compat-calls-ldouble-yes to select if w_lgamma_compatl and k_standardl should be built for long-double (in libm-compat-calls) has the same effect of the use of type-foreach (in libm-compat-calls-auto). This patch merges the contents of libm-compat-calls into libm-compat-calls-auto, then renames the latter to libm-compat-calls. Tested for powerpc64le, s390, and x86_64. * math/Makefile (libm-compat-calls-ldouble-yes): Merge into libm-compat-calls-auto. (libm-compat-calls): Likewise. (libm-compat-calls-auto): Rename to libm-compat-calls and add w_lgamma_compatF and k_standardF (merged from the items above). (libm-routines): Use libm-compat-calls, instead of libm-compat-calls-auto, with type-foreach. --- ChangeLog | 10 ++++++++++ math/Makefile | 14 +++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68ca50508f..48a76546ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2017-02-09 Gabriel F. T. Gomes + + * math/Makefile (libm-compat-calls-ldouble-yes): Merge into + libm-compat-calls-auto. + (libm-compat-calls): Likewise. + (libm-compat-calls-auto): Rename to libm-compat-calls and add + w_lgamma_compatF and k_standardF (merged from the items above). + (libm-routines): Use libm-compat-calls, instead of + libm-compat-calls-auto, with type-foreach. + 2017-02-09 Joseph Myers * math/test-math-inline.h (__LIBC_INTERNAL_MATH_INLINES): Undefine diff --git a/math/Makefile b/math/Makefile index 5d93b4fa4c..273521223c 100644 --- a/math/Makefile +++ b/math/Makefile @@ -75,19 +75,15 @@ libm-calls = \ s_setpayloadF s_setpayloadsigF s_roundevenF s_fromfpF s_ufromfpF \ s_fromfpxF s_ufromfpxF $(gen-libm-calls) -libm-compat-calls-auto = \ +libm-compat-calls = \ w_acosF_compat w_acoshF_compat w_asinF_compat w_atan2F_compat \ w_atanhF_compat w_coshF_compat w_exp2F_compat w_exp10F_compat \ w_fmodF_compat w_hypotF_compat w_j0F_compat w_j1F_compat \ w_jnF_compat w_log2F_compat w_log10F_compat w_logF_compat \ w_powF_compat w_remainderF_compat w_scalbF_compat \ w_sinhF_compat w_sqrtF_compat w_tgammaF_compat \ - w_lgammaF_r_compat w_lgammaF_compat2 w_expF_compat - -libm-compat-calls-ldouble-yes = w_lgamma_compatl k_standardl -libm-compat-calls = w_lgamma_compatf w_lgamma_compat k_standard k_standardf \ - $(libm-compat-calls-ldouble-$(long-double-fcts)) - + w_lgammaF_r_compat w_lgammaF_compat2 w_expF_compat \ + w_lgamma_compatF k_standardF # Type specific routine support. # @@ -121,8 +117,8 @@ type-float-routines := k_rem_pio2f # Apply suffix to each type in arg 1 type-foreach = $(foreach t,$(types),$(subst F,$(type-$(t)-suffix),$(1))) -libm-routines = $(strip $(libm-support) $(libm-compat-calls) \ - $(call type-foreach, $(libm-compat-calls-auto)) \ +libm-routines = $(strip $(libm-support) \ + $(call type-foreach, $(libm-compat-calls)) \ $(call type-foreach, $(libm-calls)) \ $(foreach t, $(types), $(type-$(t)-routines))) \ -- cgit 1.4.1