From 01f2881245eabf6daeeb8505242047ece4027c5a Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 14 Sep 2017 22:28:53 +0000 Subject: Make more libm functions into weak aliases. Many libm functions define the function as __ and then define as a weak alias. This is not at all limited to cases where there is an internal call that has namespace reasons to need to call __ instead of . The common macros for creating libm function aliases work on the basis of public function names all being aliases; that is, they define aliases for functions using the above pattern. Thus, where a function just defines the public name directly, changing that to be a weak alias enables a subsequent conversion to the common macros to retain the exact existing symbols (and so be testable by comparison of stripped binaries). This patch converts many existing functions to use the weak alias pattern, as preparation for subsequent conversions to common macros. I do expect that _FloatN/_FloatNx function aliases will end up needing new variants of the common macros that do *not* create the original float / double / long double name of a function - for cases where that name is created specially to give it a particular symbol version, for example - but for functions that can use the most common macros to create all the public names as aliases, it makes sense for them to do so. Regarding the Bessel function wrappers in this patch: only float and double wrappers are changed because the long double wrappers already used the weak alias pattern. Tested for x86_64, and with build-many-glibcs.py. * include/math.h (roundeven): Change hidden_proto call to __roundeven. * math/w_j0_compat.c (j0): Rename to __j0 and define as weak alias. [NO_LONG_DOUBLE] (__j0l): New strong alias. (y0): Rename to __y0 and define as weak alias. [NO_LONG_DOUBLE] (__y0l): New strong alias. * math/w_j0f_compat.c (j0f): Rename to __j0f and define as weak alias. (y0f): Rename to __y0f and define as weak alias. * math/w_j1_compat.c (j1): Rename to __j1 and define as weak alias. [NO_LONG_DOUBLE] (__j1l): New strong alias. (y1): Rename to __y1 and define as weak alias. [NO_LONG_DOUBLE] (__y1l): New strong alias. * math/w_j1f_compat.c (j1f): Rename to __j1f and define as weak alias. (y1f): Rename to __y1f and define as weak alias. * math/w_jn_compat.c (jn): Rename to __jn and define as weak alias. [NO_LONG_DOUBLE] (__jnl): New strong alias. (yn): Rename to __yn and define as weak alias. [NO_LONG_DOUBLE] (__ynl): New strong alias. * math/w_jnf_compat.c (jnf): Rename to __jnf and define as weak alias. (ynf): Rename to __ynf and define as weak alias. * sysdeps/ieee754/dbl-64/s_fromfp.c (FUNC): Define to __fromfp. (fromfp): Define as weak alias. [NO_LONG_DOUBLE] (__fromfpl): New strong alias. * sysdeps/ieee754/dbl-64/s_fromfpx.c (FUNC): Define to __fromfpx. (fromfpx): Define as weak alias. [NO_LONG_DOUBLE] (__fromfpxl): New strong alias. * sysdeps/ieee754/dbl-64/s_getpayload.c (getpayload): Rename to __getpayload and define as weak alias. [NO_LONG_DOUBLE] (__getpayloadl): New strong alias. * sysdeps/ieee754/dbl-64/s_roundeven.c (roundeven): Rename to __roundeven and define as weak alias. [NO_LONG_DOUBLE] (__roundevenl): New strong alias. * sysdeps/ieee754/dbl-64/s_setpayload.c (FUNC): Define to __setpayload. (setpayload): Define as weak alias. [NO_LONG_DOUBLE] (__setpayloadl): New strong alias. * sysdeps/ieee754/dbl-64/s_setpayloadsig.c (FUNC): Define to __setpayloadsig. (setpayloadsig): Define as weak alias. [NO_LONG_DOUBLE] (__setpayloadsigl): New strong alias. * sysdeps/ieee754/dbl-64/s_totalorder.c (totalorder): Rename to __totalorder and define as weak alias. [NO_LONG_DOUBLE] (__totalorderl): New strong alias. * sysdeps/ieee754/dbl-64/s_totalordermag.c (totalordermag): Rename to __totalordermag and define as weak alias. [NO_LONG_DOUBLE] (__totalordermagl): New strong alias. * sysdeps/ieee754/dbl-64/s_ufromfp.c (FUNC): Define to __ufromfp. (ufromfp): Define as weak alias. [NO_LONG_DOUBLE] (__ufromfpl): New strong alias. * sysdeps/ieee754/dbl-64/s_ufromfpx.c (FUNC): Define to __ufromfpx. (ufromfpx): Define as weak alias. [NO_LONG_DOUBLE] (__ufromfpxl): New strong alias. * sysdeps/ieee754/dbl-64/wordsize-64/s_getpayload.c (getpayload): Rename to __getpayload and define as weak alias. [NO_LONG_DOUBLE] (__getpayloadl): New strong alias. * sysdeps/ieee754/dbl-64/wordsize-64/s_roundeven.c (roundeven): Rename to __roundeven and define as weak alias. [NO_LONG_DOUBLE] (__roundevenl): New strong alias. * sysdeps/ieee754/dbl-64/wordsize-64/s_totalorder.c (totalorder): Rename to __totalorder and define as weak alias. [NO_LONG_DOUBLE] (__totalorderl): New strong alias. * sysdeps/ieee754/dbl-64/wordsize-64/s_totalordermag.c (totalordermag): Rename to __totalordermag and define as weak alias. [NO_LONG_DOUBLE] (__totalordermagl): New strong alias. * sysdeps/ieee754/float128/float128_private.h (__getpayloadl): New macro. (__roundevenl): Likewise. (__totalorderl): Likewise. (__totalordermagl): Likewise * sysdeps/ieee754/float128/s_fromfpf128.c (FUNC): Define to __fromfpf128. (fromfpf128): Define as weak alias. * sysdeps/ieee754/float128/s_fromfpxf128.c (FUNC): Define to __fromfpxf128. (fromfpxf128): Define as weak alias. * sysdeps/ieee754/float128/s_setpayloadf128.c (FUNC): Define to __setpayloadf128. (setpayloadf128): Define as weak alias. * sysdeps/ieee754/float128/s_setpayloadsigf128.c (FUNC): Define to __setpayloadsigf128. (setpayloadsigf128): Define as weak alias. * sysdeps/ieee754/float128/s_ufromfpf128.c (FUNC): Define to __ufromfpf128. (ufromfpf128): Define as weak alias. * sysdeps/ieee754/float128/s_ufromfpxf128.c (FUNC): Define to __ufromfpxf128. (ufromfpxf128): Define as weak alias. * sysdeps/ieee754/flt-32/s_fromfpf.c (FUNC): Define to __fromfpf. (fromfpf): Define as weak alias. * sysdeps/ieee754/flt-32/s_fromfpxf.c (FUNC): Define to __fromfpxf. (fromfpxf): Define as weak alias. * sysdeps/ieee754/flt-32/s_getpayloadf.c (getpayloadf): Rename to __getpayloadf and define as weak alias. * sysdeps/ieee754/flt-32/s_roundevenf.c (roundevenf): Rename to __roundevenf and define as weak alias. * sysdeps/ieee754/flt-32/s_setpayloadf.c (FUNC): Define to __setpayloadf. (setpayloadf): Define as weak alias. * sysdeps/ieee754/flt-32/s_setpayloadsigf.c (FUNC): Define to __setpayloadsigf. (setpayloadsigf): Define as weak alias. * sysdeps/ieee754/flt-32/s_totalorderf.c (totalorderf): Rename to __totalorderf and define as weak alias. * sysdeps/ieee754/flt-32/s_totalordermagf.c (totalordermagf): Rename to __totalordermagf and define as weak alias. * sysdeps/ieee754/flt-32/s_ufromfpf.c (FUNC): Define to __ufromfpf. (ufromfpf): Define as weak alias. * sysdeps/ieee754/flt-32/s_ufromfpxf.c (FUNC): Define to __ufromfpxf. (ufromfpxf): Define as weak alias. * sysdeps/ieee754/ldbl-128/s_fromfpl.c (FUNC): Define to __fromfpl. (fromfpl): Define as weak alias. * sysdeps/ieee754/ldbl-128/s_fromfpxl.c (FUNC): Define to __fromfpxl. (fromfpxl): Define as weak alias. * sysdeps/ieee754/ldbl-128/s_getpayloadl.c (getpayloadl): Rename to __getpayloadl and define as weak alias. * sysdeps/ieee754/ldbl-128/s_roundevenl.c (roundevenl): Rename to __roundevenl and define as weak alias. * sysdeps/ieee754/ldbl-128/s_setpayloadl.c (FUNC): Define to __setpayloadl. (setpayloadl): Define as weak alias. * sysdeps/ieee754/ldbl-128/s_setpayloadsigl.c (FUNC): Define to __setpayloadsigl. (setpayloadsigl): Define as weak alias. * sysdeps/ieee754/ldbl-128/s_totalorderl.c (totalorderl): Rename to __totalorderl and define as weak alias. * sysdeps/ieee754/ldbl-128/s_totalordermagl.c (totalordermagl): Rename to __totalordermagl and define as weak alias. * sysdeps/ieee754/ldbl-128/s_ufromfpl.c (FUNC): Define to __ufromfpl. (ufromfpl): Define as weak alias. * sysdeps/ieee754/ldbl-128/s_ufromfpxl.c (FUNC): Define to __ufromfpxl. (ufromfpxl): Define as weak alias. * sysdeps/ieee754/ldbl-128ibm/s_fromfpl.c (FUNC): Define to __fromfpl. (fromfpl): Define as weak alias. * sysdeps/ieee754/ldbl-128ibm/s_fromfpxl.c (FUNC): Define to __fromfpxl. (fromfpxl): Define as weak alias. * sysdeps/ieee754/ldbl-128ibm/s_getpayloadl.c (getpayloadl): Rename to __getpayloadl and define as weak alias. * sysdeps/ieee754/ldbl-128ibm/s_roundevenl.c (roundevenl): Rename to __roundevenl and define as weak alias. Call __roundeven instead of roundeven. * sysdeps/ieee754/ldbl-128ibm/s_setpayloadl.c (FUNC): Define to __setpayloadl. (setpayloadl): Define as weak alias. * sysdeps/ieee754/ldbl-128ibm/s_setpayloadsigl.c (FUNC): Define to __setpayloadsigl. (setpayloadsigl): Define as weak alias. * sysdeps/ieee754/ldbl-128ibm/s_totalorderl.c (totalorderl): Rename to __totalorderl and define as weak alias. * sysdeps/ieee754/ldbl-128ibm/s_totalordermagl.c (totalordermagl): Rename to __totalordermagl and define as weak alias. * sysdeps/ieee754/ldbl-128ibm/s_ufromfpl.c (FUNC): Define to __ufromfpl. (ufromfpl): Define as weak alias. * sysdeps/ieee754/ldbl-128ibm/s_ufromfpxl.c (FUNC): Define to __ufromfpxl. (ufromfpxl): Define as weak alias. * sysdeps/ieee754/ldbl-96/s_fromfpl.c (FUNC): Define to __fromfpl. (fromfpl): Define as weak alias. * sysdeps/ieee754/ldbl-96/s_fromfpxl.c (FUNC): Define to __fromfpxl. (fromfpxl): Define as weak alias. * sysdeps/ieee754/ldbl-96/s_getpayloadl.c (getpayloadl): Rename to __getpayloadl and define as weak alias. * sysdeps/ieee754/ldbl-96/s_roundevenl.c (roundevenl): Rename to __roundevenl and define as weak alias. * sysdeps/ieee754/ldbl-96/s_setpayloadl.c (FUNC): Define to __setpayloadl. (setpayloadl): Define as weak alias. * sysdeps/ieee754/ldbl-96/s_setpayloadsigl.c (FUNC): Define to __setpayloadsigl. (setpayloadsigl): Define as weak alias. * sysdeps/ieee754/ldbl-96/s_totalorderl.c (totalorderl): Rename to __totalorderl and define as weak alias. * sysdeps/ieee754/ldbl-96/s_totalordermagl.c (totalordermagl): Rename to __totalordermagl and define as weak alias. * sysdeps/ieee754/ldbl-96/s_ufromfpl.c (FUNC): Define to __ufromfpl. (ufromfpl): Define as weak alias. * sysdeps/ieee754/ldbl-96/s_ufromfpxl.c (FUNC): Define to __ufromfpxl. (ufromfpxl): Define as weak alias. --- math/w_j0_compat.c | 12 ++++++++---- math/w_j0f_compat.c | 6 ++++-- math/w_j1_compat.c | 12 ++++++++---- math/w_j1f_compat.c | 6 ++++-- math/w_jn_compat.c | 12 ++++++++---- math/w_jnf_compat.c | 6 ++++-- 6 files changed, 36 insertions(+), 18 deletions(-) (limited to 'math') diff --git a/math/w_j0_compat.c b/math/w_j0_compat.c index 3df71e0..b08688e 100644 --- a/math/w_j0_compat.c +++ b/math/w_j0_compat.c @@ -25,7 +25,7 @@ #if LIBM_SVID_COMPAT /* wrapper j0 */ double -j0 (double x) +__j0 (double x) { if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0) && _LIB_VERSION != _IEEE_ && _LIB_VERSION != _POSIX_) @@ -34,14 +34,16 @@ j0 (double x) return __ieee754_j0 (x); } +weak_alias (__j0, j0) # ifdef NO_LONG_DOUBLE -weak_alias (j0, j0l) +strong_alias (__j0, __j0l) +weak_alias (__j0, j0l) # endif /* wrapper y0 */ double -y0 (double x) +__y0 (double x) { if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0) && _LIB_VERSION != _IEEE_) @@ -65,7 +67,9 @@ y0 (double x) return __ieee754_y0 (x); } +weak_alias (__y0, y0) # ifdef NO_LONG_DOUBLE -weak_alias (y0, y0l) +strong_alias (__y0, __y0l) +weak_alias (__y0, y0l) # endif #endif diff --git a/math/w_j0f_compat.c b/math/w_j0f_compat.c index e9ac74f..0ef4179 100644 --- a/math/w_j0f_compat.c +++ b/math/w_j0f_compat.c @@ -25,7 +25,7 @@ #if LIBM_SVID_COMPAT /* wrapper j0f */ float -j0f (float x) +__j0f (float x) { if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0) && _LIB_VERSION != _IEEE_ && _LIB_VERSION != _POSIX_) @@ -34,11 +34,12 @@ j0f (float x) return __ieee754_j0f (x); } +weak_alias (__j0f, j0f) /* wrapper y0f */ float -y0f (float x) +__y0f (float x) { if (__builtin_expect (islessequal (x, 0.0f) || isgreater (x, (float) X_TLOSS), 0) @@ -63,4 +64,5 @@ y0f (float x) return __ieee754_y0f (x); } +weak_alias (__y0f, y0f) #endif diff --git a/math/w_j1_compat.c b/math/w_j1_compat.c index be788f9..bf0922d 100644 --- a/math/w_j1_compat.c +++ b/math/w_j1_compat.c @@ -25,7 +25,7 @@ #if LIBM_SVID_COMPAT /* wrapper j1 */ double -j1 (double x) +__j1 (double x) { if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0) && _LIB_VERSION != _IEEE_ && _LIB_VERSION != _POSIX_) @@ -34,14 +34,16 @@ j1 (double x) return __ieee754_j1 (x); } +weak_alias (__j1, j1) # ifdef NO_LONG_DOUBLE -weak_alias (j1, j1l) +strong_alias (__j1, __j1l) +weak_alias (__j1, j1l) # endif /* wrapper y1 */ double -y1 (double x) +__y1 (double x) { if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0) && _LIB_VERSION != _IEEE_) @@ -65,7 +67,9 @@ y1 (double x) return __ieee754_y1 (x); } +weak_alias (__y1, y1) # ifdef NO_LONG_DOUBLE -weak_alias (y1, y1l) +strong_alias (__y1, __y1l) +weak_alias (__y1, y1l) # endif #endif diff --git a/math/w_j1f_compat.c b/math/w_j1f_compat.c index c3222bb..d44fb12 100644 --- a/math/w_j1f_compat.c +++ b/math/w_j1f_compat.c @@ -25,7 +25,7 @@ #if LIBM_SVID_COMPAT /* wrapper j1f */ float -j1f (float x) +__j1f (float x) { if (__builtin_expect (isgreater (fabsf (x), X_TLOSS), 0) && _LIB_VERSION != _IEEE_ && _LIB_VERSION != _POSIX_) @@ -34,11 +34,12 @@ j1f (float x) return __ieee754_j1f (x); } +weak_alias (__j1f, j1f) /* wrapper y1f */ float -y1f (float x) +__y1f (float x) { if (__builtin_expect (islessequal (x, 0.0f) || isgreater (x, (float) X_TLOSS), 0) @@ -63,4 +64,5 @@ y1f (float x) return __ieee754_y1f (x); } +weak_alias (__y1f, y1f) #endif diff --git a/math/w_jn_compat.c b/math/w_jn_compat.c index 496c779..955996a 100644 --- a/math/w_jn_compat.c +++ b/math/w_jn_compat.c @@ -25,7 +25,7 @@ #if LIBM_SVID_COMPAT /* wrapper jn */ double -jn (int n, double x) +__jn (int n, double x) { if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0) && _LIB_VERSION != _IEEE_ && _LIB_VERSION != _POSIX_) @@ -34,14 +34,16 @@ jn (int n, double x) return __ieee754_jn (n, x); } +weak_alias (__jn, jn) # ifdef NO_LONG_DOUBLE -weak_alias (jn, jnl) +strong_alias (__jn, __jnl) +weak_alias (__jn, jnl) # endif /* wrapper yn */ double -yn (int n, double x) +__yn (int n, double x) { if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0) && _LIB_VERSION != _IEEE_) @@ -65,7 +67,9 @@ yn (int n, double x) return __ieee754_yn (n, x); } +weak_alias (__yn, yn) # ifdef NO_LONG_DOUBLE -weak_alias (yn, ynl) +strong_alias (__yn, __ynl) +weak_alias (__yn, ynl) # endif #endif diff --git a/math/w_jnf_compat.c b/math/w_jnf_compat.c index 440d53d..b2b4161 100644 --- a/math/w_jnf_compat.c +++ b/math/w_jnf_compat.c @@ -25,7 +25,7 @@ #if LIBM_SVID_COMPAT /* wrapper jnf */ float -jnf (int n, float x) +__jnf (int n, float x) { if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0) && _LIB_VERSION != _IEEE_ && _LIB_VERSION != _POSIX_) @@ -34,11 +34,12 @@ jnf (int n, float x) return __ieee754_jnf (n, x); } +weak_alias (__jnf, jnf) /* wrapper ynf */ float -ynf (int n, float x) +__ynf (int n, float x) { if (__builtin_expect (islessequal (x, 0.0f) || isgreater (x, (float) X_TLOSS), 0) @@ -63,4 +64,5 @@ ynf (int n, float x) return __ieee754_ynf (n, x); } +weak_alias (__ynf, ynf) #endif -- cgit v1.1