diff options
author | Joseph Myers <joseph@codesourcery.com> | 2017-10-10 21:29:11 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2017-10-10 21:29:11 +0000 |
commit | 24b6515d879c992be194ccd5323b8b780fa6d4d3 (patch) | |
tree | 9c1f25463ac4d352ed4a1a871c974c8bec5ceea7 /sysdeps/ieee754 | |
parent | 8ed70de2faceb4bd7b35bbdc2b7e8c83d9a297ba (diff) | |
download | glibc-24b6515d879c992be194ccd5323b8b780fa6d4d3.zip glibc-24b6515d879c992be194ccd5323b8b780fa6d4d3.tar.gz glibc-24b6515d879c992be194ccd5323b8b780fa6d4d3.tar.bz2 |
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 <libm-alias-double.h>.
[!USE_AS_COMPAT]: Use libm_alias_double_other.
* math/w_lgammaf_main.c: Include <libm-alias-float.h>.
[!USE_AS_COMPAT]: Use libm_alias_float_other.
* math/w_lgammal_main.c: Include <libm-alias-ldouble.h>.
[!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 <libm-alias-float.h>.
[!__exp2f]: Use libm_alias_float_other.
* sysdeps/ieee754/flt-32/e_expf.c: Include <libm-alias-float.h>.
[!__expf]: Use libm_alias_float_other.
* sysdeps/ieee754/flt-32/e_log2f.c: Include <libm-alias-float.h>.
[!__log2f]: Use libm_alias_float_other.
* sysdeps/ieee754/flt-32/e_logf.c: Include <libm-alias-float.h>.
[!__logf]: Use libm_alias_float_other.
* sysdeps/ieee754/flt-32/e_powf.c: Include <libm-alias-float.h>.
[!__powf]: Use libm_alias_float_other.
Diffstat (limited to 'sysdeps/ieee754')
-rw-r--r-- | sysdeps/ieee754/flt-32/e_exp2f.c | 2 | ||||
-rw-r--r-- | sysdeps/ieee754/flt-32/e_expf.c | 2 | ||||
-rw-r--r-- | sysdeps/ieee754/flt-32/e_log2f.c | 2 | ||||
-rw-r--r-- | sysdeps/ieee754/flt-32/e_logf.c | 2 | ||||
-rw-r--r-- | sysdeps/ieee754/flt-32/e_powf.c | 2 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-opt/libm-alias-double.h | 13 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-opt/libm-alias-ldouble.h | 13 |
7 files changed, 34 insertions, 2 deletions
diff --git a/sysdeps/ieee754/flt-32/e_exp2f.c b/sysdeps/ieee754/flt-32/e_exp2f.c index 31b660b..c8eca40 100644 --- a/sysdeps/ieee754/flt-32/e_exp2f.c +++ b/sysdeps/ieee754/flt-32/e_exp2f.c @@ -19,6 +19,7 @@ #include <math.h> #include <stdint.h> #include <shlib-compat.h> +#include <libm-alias-float.h> #include "math_config.h" /* @@ -90,4 +91,5 @@ __exp2f (float x) strong_alias (__exp2f, __ieee754_exp2f) strong_alias (__exp2f, __exp2f_finite) versioned_symbol (libm, __exp2f, exp2f, GLIBC_2_27); +libm_alias_float_other (__exp2, exp2) #endif diff --git a/sysdeps/ieee754/flt-32/e_expf.c b/sysdeps/ieee754/flt-32/e_expf.c index 74a383a..e449d5c 100644 --- a/sysdeps/ieee754/flt-32/e_expf.c +++ b/sysdeps/ieee754/flt-32/e_expf.c @@ -24,6 +24,7 @@ #include <math.h> #include <stdint.h> #include <shlib-compat.h> +#include <libm-alias-float.h> #include "math_config.h" /* @@ -111,4 +112,5 @@ hidden_def (__expf) strong_alias (__expf, __ieee754_expf) strong_alias (__expf, __expf_finite) versioned_symbol (libm, __expf, expf, GLIBC_2_27); +libm_alias_float_other (__exp, exp) #endif diff --git a/sysdeps/ieee754/flt-32/e_log2f.c b/sysdeps/ieee754/flt-32/e_log2f.c index ef13b37..24cc11d 100644 --- a/sysdeps/ieee754/flt-32/e_log2f.c +++ b/sysdeps/ieee754/flt-32/e_log2f.c @@ -19,6 +19,7 @@ #include <math.h> #include <stdint.h> #include <shlib-compat.h> +#include <libm-alias-float.h> #include "math_config.h" /* @@ -90,4 +91,5 @@ __log2f (float x) strong_alias (__log2f, __ieee754_log2f) strong_alias (__log2f, __log2f_finite) versioned_symbol (libm, __log2f, log2f, GLIBC_2_27); +libm_alias_float_other (__log2, log2) #endif diff --git a/sysdeps/ieee754/flt-32/e_logf.c b/sysdeps/ieee754/flt-32/e_logf.c index ea847b5..80fec73 100644 --- a/sysdeps/ieee754/flt-32/e_logf.c +++ b/sysdeps/ieee754/flt-32/e_logf.c @@ -19,6 +19,7 @@ #include <math.h> #include <stdint.h> #include <shlib-compat.h> +#include <libm-alias-float.h> #include "math_config.h" /* @@ -89,4 +90,5 @@ __logf (float x) strong_alias (__logf, __ieee754_logf) strong_alias (__logf, __logf_finite) versioned_symbol (libm, __logf, logf, GLIBC_2_27); +libm_alias_float_other (__log, log) #endif diff --git a/sysdeps/ieee754/flt-32/e_powf.c b/sysdeps/ieee754/flt-32/e_powf.c index 08d2c6d..1c59b77 100644 --- a/sysdeps/ieee754/flt-32/e_powf.c +++ b/sysdeps/ieee754/flt-32/e_powf.c @@ -19,6 +19,7 @@ #include <math.h> #include <stdint.h> #include <shlib-compat.h> +#include <libm-alias-float.h> #include "math_config.h" /* @@ -219,4 +220,5 @@ __powf (float x, float y) strong_alias (__powf, __ieee754_powf) strong_alias (__powf, __powf_finite) versioned_symbol (libm, __powf, powf, GLIBC_2_27); +libm_alias_float_other (__pow, pow) #endif diff --git a/sysdeps/ieee754/ldbl-opt/libm-alias-double.h b/sysdeps/ieee754/ldbl-opt/libm-alias-double.h index 5ae4c8b..4c22ffb 100644 --- a/sysdeps/ieee754/ldbl-opt/libm-alias-double.h +++ b/sysdeps/ieee754/ldbl-opt/libm-alias-double.h @@ -23,6 +23,16 @@ #include <first-versions.h> #include <ldbl-compat-choose.h> +/* Define _FloatN / _FloatNx aliases for a double libm function that + has internal name FROM ## R and public names TO ## suffix ## R for + each suffix of a supported _FloatN / _FloatNx floating-point type + with the same format as double. */ +#define libm_alias_double_other_r(from, to, r) + +/* Likewise, but without the R suffix. */ +#define libm_alias_double_other(from, to) \ + libm_alias_double_other_r (from, to, ) + /* Define aliases for a double libm function that has internal name FROM ## R and public names TO ## suffix ## R for each suffix of a supported floating-point type with the same format as double. This @@ -36,7 +46,8 @@ (compat_symbol (libm, \ from ## r, \ to ## l ## r, \ - FIRST_VERSION_libm_ ## to ## l ## r), ); + FIRST_VERSION_libm_ ## to ## l ## r), ); \ + libm_alias_double_other_r (from, to, r) /* Likewise, but without the R suffix. */ #define libm_alias_double(from, to) libm_alias_double_r (from, to, ) diff --git a/sysdeps/ieee754/ldbl-opt/libm-alias-ldouble.h b/sysdeps/ieee754/ldbl-opt/libm-alias-ldouble.h index ae32027..291a5f5 100644 --- a/sysdeps/ieee754/ldbl-opt/libm-alias-ldouble.h +++ b/sysdeps/ieee754/ldbl-opt/libm-alias-ldouble.h @@ -22,6 +22,16 @@ #include <math_ldbl_opt.h> #include <ldbl-compat-choose.h> +/* Define _FloatN / _FloatNx aliases for a long double libm function + that has internal name FROM ## l ## R and public names TO ## suffix + ## R for each suffix of a supported _FloatN / _FloatNx + floating-point type with the same format as long double. */ +#define libm_alias_ldouble_other_r(from, to, r) + +/* Likewise, but without the R suffix. */ +#define libm_alias_ldouble_other(from, to) \ + libm_alias_ldouble_other_r (from, to, ) + /* Define aliases for a long double libm function that has internal name FROM ## l ## R and public names TO ## suffix ## R for each suffix of a supported floating-point type with the same format as @@ -33,7 +43,8 @@ #define libm_alias_ldouble_r(from, to, r) \ LONG_DOUBLE_COMPAT_CHOOSE_libm_ ## to ## l ## r \ (long_double_symbol (libm, from ## l ## r, to ## l ## r), \ - weak_alias (from ## l ## r, to ## l ## r)); + weak_alias (from ## l ## r, to ## l ## r)); \ + libm_alias_ldouble_other_r (from, to, r) /* Likewise, but without the R suffix. */ #define libm_alias_ldouble(from, to) libm_alias_ldouble_r (from, to, ) |