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/generic | |
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/generic')
-rw-r--r-- | sysdeps/generic/libm-alias-double.h | 16 | ||||
-rw-r--r-- | sysdeps/generic/libm-alias-float.h | 13 | ||||
-rw-r--r-- | sysdeps/generic/libm-alias-float128.h | 14 | ||||
-rw-r--r-- | sysdeps/generic/libm-alias-ldouble.h | 13 |
4 files changed, 51 insertions, 5 deletions
diff --git a/sysdeps/generic/libm-alias-double.h b/sysdeps/generic/libm-alias-double.h index 23b5990..0593ad9 100644 --- a/sysdeps/generic/libm-alias-double.h +++ b/sysdeps/generic/libm-alias-double.h @@ -19,6 +19,16 @@ #ifndef _LIBM_ALIAS_DOUBLE_H #define _LIBM_ALIAS_DOUBLE_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 @@ -30,10 +40,12 @@ # define libm_alias_double_r(from, to, r) \ weak_alias (from ## r, to ## r) \ strong_alias (from ## r, from ## l ## r) \ - weak_alias (from ## r, to ## l ## r) + weak_alias (from ## r, to ## l ## r) \ + libm_alias_double_other_r (from, to, r) #else # define libm_alias_double_r(from, to, r) \ - weak_alias (from ## r, to ## r) + weak_alias (from ## r, to ## r) \ + libm_alias_double_other_r (from, to, r) #endif /* Likewise, but without the R suffix. */ diff --git a/sysdeps/generic/libm-alias-float.h b/sysdeps/generic/libm-alias-float.h index 23f0166..11bd472 100644 --- a/sysdeps/generic/libm-alias-float.h +++ b/sysdeps/generic/libm-alias-float.h @@ -19,6 +19,16 @@ #ifndef _LIBM_ALIAS_FLOAT_H #define _LIBM_ALIAS_FLOAT_H +/* Define _FloatN / _FloatNx aliases for a float libm function that + has internal name FROM ## f ## R and public names TO ## suffix ## R + for each suffix of a supported _FloatN / _FloatNx floating-point + type with the same format as float. */ +#define libm_alias_float_other_r(from, to, r) + +/* Likewise, but without the R suffix. */ +#define libm_alias_float_other(from, to) \ + libm_alias_float_other_r (from, to, ) + /* Define aliases for a float libm function that has internal name FROM ## f ## R and public names TO ## suffix ## R for each suffix of a supported floating-point type with the same format as float. @@ -27,7 +37,8 @@ names (where there is one name per format, not per type) or for obsolescent functions not provided for _FloatN types. */ #define libm_alias_float_r(from, to, r) \ - weak_alias (from ## f ## r, to ## f ## r) + weak_alias (from ## f ## r, to ## f ## r) \ + libm_alias_float_other_r (from, to, r) /* Likewise, but without the R suffix. */ #define libm_alias_float(from, to) libm_alias_float_r (from, to, ) diff --git a/sysdeps/generic/libm-alias-float128.h b/sysdeps/generic/libm-alias-float128.h index 6bb1cb1..8a7ebf3 100644 --- a/sysdeps/generic/libm-alias-float128.h +++ b/sysdeps/generic/libm-alias-float128.h @@ -19,6 +19,17 @@ #ifndef _LIBM_ALIAS_FLOAT128_H #define _LIBM_ALIAS_FLOAT128_H +/* Define _FloatN / _FloatNx aliases (other than that for _Float128) + for a _Float128 libm function that has internal name FROM ## f128 + ## R and public names TO ## suffix ## R for each suffix of a + supported _FloatN / _FloatNx floating-point type with the same + format as _Float128. */ +#define libm_alias_float128_other_r(from, to, r) + +/* Likewise, but without the R suffix. */ +#define libm_alias_float128_other(from, to) \ + libm_alias_float128_other_r (from, to, ) + /* Define aliases for a _Float128 libm function that has internal name FROM ## f128 ## R and public names TO ## suffix ## R for each suffix of a supported floating-point type with the same format as @@ -28,7 +39,8 @@ per format, not per type) or for obsolescent functions not provided for _FloatN types. */ #define libm_alias_float128_r(from, to, r) \ - weak_alias (from ## f128 ## r, to ## f128 ## r) + weak_alias (from ## f128 ## r, to ## f128 ## r) \ + libm_alias_float128_other_r (from, to, r) /* Likewise, but without the R suffix. */ #define libm_alias_float128(from, to) libm_alias_float128_r (from, to, ) diff --git a/sysdeps/generic/libm-alias-ldouble.h b/sysdeps/generic/libm-alias-ldouble.h index 7414b92..82dafd5 100644 --- a/sysdeps/generic/libm-alias-ldouble.h +++ b/sysdeps/generic/libm-alias-ldouble.h @@ -19,6 +19,16 @@ #ifndef _LIBM_ALIAS_LDOUBLE_H #define _LIBM_ALIAS_LDOUBLE_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 @@ -28,7 +38,8 @@ per format, not per type) or for obsolescent functions not provided for _FloatN types. */ #define libm_alias_ldouble_r(from, to, 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, ) |