From 24b6515d879c992be194ccd5323b8b780fa6d4d3 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 10 Oct 2017 21:29:11 +0000 Subject: Add libm_alias_*_other_r macros. Some libm functions are unable to use the generic alias macros such as libm_alias_double because they have special symbol versioning requirements for the main float, double or long double public names. To facilitate adding _FloatN / _FloatNx function aliases in future, it's still desirable to have generic macros those functions can use as far as possible. This patch adds macros such as libm_alias_double_other, which only define names for _FloatN / _FloatNx aliases, not for float / double / long double. As present, all these new macros do nothing, but they are called in the appropriate places in macros such as libm_alias_double. This patch also arranges for lgamma implementations, and the recently added optimized float function implementations, to use the new macros to make them ready for addition of _FloatN / _FloatNx aliases. Tested for x86_64, and tested with build-many-glibcs.py that installed stripped shared libraries are unchanged by this patch. * sysdeps/generic/libm-alias-double.h (libm_alias_double_other_r): New macro. (libm_alias_double_other): Likewise. (libm_alias_double_r): Use libm_alias_double_other_r. * sysdeps/generic/libm-alias-float.h (libm_alias_float_other_r): New macro. (libm_alias_float_other): Likewise. (libm_alias_float_r): Use libm_alias_float_other_r. * sysdeps/generic/libm-alias-float128.h (libm_alias_float128_other_r): New macro. (libm_alias_float128_other): Likewise. (libm_alias_float128_r): Use libm_alias_float128_other_r. * sysdeps/generic/libm-alias-ldouble.h (libm_alias_ldouble_other_r): New macro. (libm_alias_ldouble_other): Likewise. (libm_alias_ldouble_r): Use libm_alias_ldouble_other_r. * sysdeps/ieee754/ldbl-opt/libm-alias-double.h (libm_alias_double_other_r): New macro. (libm_alias_double_other): Likewise. (libm_alias_double_r): Use libm_alias_double_other_r. * sysdeps/ieee754/ldbl-opt/libm-alias-ldouble.h (libm_alias_ldouble_other_r): New macro. (libm_alias_ldouble_other): Likewise. (libm_alias_ldouble_r): Use libm_alias_ldouble_other_r. * math/w_lgamma_main.c: Include . [!USE_AS_COMPAT]: Use libm_alias_double_other. * math/w_lgammaf_main.c: Include . [!USE_AS_COMPAT]: Use libm_alias_float_other. * math/w_lgammal_main.c: Include . [!USE_AS_COMPAT]: Use libm_alias_ldouble_other. * math/w_exp2f.c: Use libm_alias_float_other. * math/w_expf.c: Likewise. * math/w_log2f.c: Likewise. * math/w_logf.c: Likewise. * math/w_powf.c: Likewise. * sysdeps/ieee754/flt-32/e_exp2f.c: Include . [!__exp2f]: Use libm_alias_float_other. * sysdeps/ieee754/flt-32/e_expf.c: Include . [!__expf]: Use libm_alias_float_other. * sysdeps/ieee754/flt-32/e_log2f.c: Include . [!__log2f]: Use libm_alias_float_other. * sysdeps/ieee754/flt-32/e_logf.c: Include . [!__logf]: Use libm_alias_float_other. * sysdeps/ieee754/flt-32/e_powf.c: Include . [!__powf]: Use libm_alias_float_other. --- math/w_exp2f.c | 1 + math/w_expf.c | 1 + math/w_lgamma_main.c | 2 ++ math/w_lgammaf_main.c | 2 ++ math/w_lgammal_main.c | 2 ++ math/w_log2f.c | 1 + math/w_logf.c | 1 + math/w_powf.c | 1 + 8 files changed, 11 insertions(+) (limited to 'math') diff --git a/math/w_exp2f.c b/math/w_exp2f.c index 948d745dab..71aadce801 100644 --- a/math/w_exp2f.c +++ b/math/w_exp2f.c @@ -5,3 +5,4 @@ #define declare_mgen_alias(a, b) #include versioned_symbol (libm, __exp2f, exp2f, GLIBC_2_27); +libm_alias_float_other (__exp2, exp2) diff --git a/math/w_expf.c b/math/w_expf.c index 6d5f03c5f9..00d191ec15 100644 --- a/math/w_expf.c +++ b/math/w_expf.c @@ -5,3 +5,4 @@ #define declare_mgen_alias(a, b) #include versioned_symbol (libm, __expf, expf, GLIBC_2_27); +libm_alias_float_other (__exp, exp) diff --git a/math/w_lgamma_main.c b/math/w_lgamma_main.c index 7dbba22f4e..ac91b9d9e6 100644 --- a/math/w_lgamma_main.c +++ b/math/w_lgamma_main.c @@ -19,6 +19,7 @@ #include #include #include +#include #include @@ -48,6 +49,7 @@ versioned_symbol (libm, __lgamma, lgamma, LGAMMA_NEW_VER); strong_alias (__lgamma, __lgammal) versioned_symbol (libm, __lgammal, lgammal, LGAMMA_NEW_VER); # endif +libm_alias_double_other (__lgamma, lgamma) # endif # if GAMMA_ALIAS strong_alias (LGFUNC (__lgamma), __gamma) diff --git a/math/w_lgammaf_main.c b/math/w_lgammaf_main.c index a3d7e1ae99..ef6065994f 100644 --- a/math/w_lgammaf_main.c +++ b/math/w_lgammaf_main.c @@ -16,6 +16,7 @@ #include #include #include +#include #include @@ -37,6 +38,7 @@ LGFUNC (__lgammaf) (float x) compat_symbol (libm, __lgammaf_compat, lgammaf, LGAMMA_OLD_VER); # else versioned_symbol (libm, __lgammaf, lgammaf, LGAMMA_NEW_VER); +libm_alias_float_other (__lgamma, lgamma) # endif # if GAMMA_ALIAS strong_alias (LGFUNC (__lgammaf), __gammaf) diff --git a/math/w_lgammal_main.c b/math/w_lgammal_main.c index 447fb97cb7..f269cef6ab 100644 --- a/math/w_lgammal_main.c +++ b/math/w_lgammal_main.c @@ -23,6 +23,7 @@ #include #include #include +#include #include @@ -44,6 +45,7 @@ LGFUNC (__lgammal) (long double x) compat_symbol (libm, __lgammal_compat, lgammal, LGAMMA_OLD_VER); # else versioned_symbol (libm, __lgammal, lgammal, LGAMMA_NEW_VER); +libm_alias_ldouble_other (__lgamma, lgamma) # endif # if GAMMA_ALIAS strong_alias (LGFUNC (__lgammal), __gammal) diff --git a/math/w_log2f.c b/math/w_log2f.c index cda0c3a644..d21b602d56 100644 --- a/math/w_log2f.c +++ b/math/w_log2f.c @@ -5,3 +5,4 @@ #define declare_mgen_alias(a, b) #include versioned_symbol (libm, __log2f, log2f, GLIBC_2_27); +libm_alias_float_other (__log2, log2) diff --git a/math/w_logf.c b/math/w_logf.c index d960e016d7..63736f4530 100644 --- a/math/w_logf.c +++ b/math/w_logf.c @@ -5,3 +5,4 @@ #define declare_mgen_alias(a, b) #include versioned_symbol (libm, __logf, logf, GLIBC_2_27); +libm_alias_float_other (__log, log) diff --git a/math/w_powf.c b/math/w_powf.c index a18348329e..aea9058ebe 100644 --- a/math/w_powf.c +++ b/math/w_powf.c @@ -5,3 +5,4 @@ #define declare_mgen_alias(a, b) #include versioned_symbol (libm, __powf, powf, GLIBC_2_27); +libm_alias_float_other (__pow, pow) -- cgit v1.2.1