From 220622dde5704c95a100c2792a280f18f3deba73 Mon Sep 17 00:00:00 2001 From: Wilco Dijkstra Date: Tue, 16 Jul 2019 12:17:22 -0300 Subject: Add libm_alias_finite for _finite symbols This patch adds a new macro, libm_alias_finite, to define all _finite symbol. It sets all _finite symbol as compat symbol based on its first version (obtained from the definition at built generated first-versions.h). The f128_finite symbols were introduced in GLIBC 2.26 and so need special treatment in code that is shared between long double and float128. It is done by adding a list, similar to internal symbol redifinition, on sysdeps/ieee754/float128/float128_private.h. Alpha also needs some tricky changes to ensure we still emit 2 compat symbols for sqrt(f). Passes buildmanyglibc. Co-authored-by: Adhemerval Zanella Reviewed-by: Siddhesh Poyarekar --- sysdeps/x86_64/fpu/multiarch/e_asin.c | 7 ++++--- sysdeps/x86_64/fpu/multiarch/e_atan2.c | 4 +++- sysdeps/x86_64/fpu/multiarch/e_exp.c | 3 ++- sysdeps/x86_64/fpu/multiarch/e_exp2f.c | 6 +++--- sysdeps/x86_64/fpu/multiarch/e_expf.c | 6 +++--- sysdeps/x86_64/fpu/multiarch/e_log.c | 3 ++- sysdeps/x86_64/fpu/multiarch/e_log2f.c | 6 +++--- sysdeps/x86_64/fpu/multiarch/e_logf.c | 6 +++--- sysdeps/x86_64/fpu/multiarch/e_pow.c | 3 ++- sysdeps/x86_64/fpu/multiarch/e_powf.c | 6 +++--- 10 files changed, 28 insertions(+), 22 deletions(-) (limited to 'sysdeps/x86_64/fpu/multiarch') diff --git a/sysdeps/x86_64/fpu/multiarch/e_asin.c b/sysdeps/x86_64/fpu/multiarch/e_asin.c index bcd4a973d6..7cdb069e65 100644 --- a/sysdeps/x86_64/fpu/multiarch/e_asin.c +++ b/sysdeps/x86_64/fpu/multiarch/e_asin.c @@ -16,6 +16,8 @@ License along with the GNU C Library; if not, see . */ +#include + extern double __redirect_ieee754_asin (double); extern double __redirect_ieee754_acos (double); @@ -24,7 +26,7 @@ extern double __redirect_ieee754_acos (double); libc_ifunc_redirected (__redirect_ieee754_asin, __ieee754_asin, IFUNC_SELECTOR ()); -strong_alias (__ieee754_asin, __asin_finite) +libm_alias_finite (__ieee754_asin, __asin) #undef SYMBOL_NAME #define SYMBOL_NAME ieee754_acos @@ -32,8 +34,7 @@ strong_alias (__ieee754_asin, __asin_finite) libc_ifunc_redirected (__redirect_ieee754_acos, __ieee754_acos, IFUNC_SELECTOR ()); -strong_alias (__ieee754_acos, __acos_finite) - +libm_alias_finite (__ieee754_acos, __acos) #define __ieee754_acos __ieee754_acos_sse2 #define __ieee754_asin __ieee754_asin_sse2 diff --git a/sysdeps/x86_64/fpu/multiarch/e_atan2.c b/sysdeps/x86_64/fpu/multiarch/e_atan2.c index dfd9b4eede..f06e980b1c 100644 --- a/sysdeps/x86_64/fpu/multiarch/e_atan2.c +++ b/sysdeps/x86_64/fpu/multiarch/e_atan2.c @@ -16,6 +16,8 @@ License along with the GNU C Library; if not, see . */ +#include + extern double __redirect_ieee754_atan2 (double, double); #define SYMBOL_NAME ieee754_atan2 @@ -23,7 +25,7 @@ extern double __redirect_ieee754_atan2 (double, double); libc_ifunc_redirected (__redirect_ieee754_atan2, __ieee754_atan2, IFUNC_SELECTOR ()); -strong_alias (__ieee754_atan2, __atan2_finite) +libm_alias_finite (__ieee754_atan2, __atan2) #define __ieee754_atan2 __ieee754_atan2_sse2 #include diff --git a/sysdeps/x86_64/fpu/multiarch/e_exp.c b/sysdeps/x86_64/fpu/multiarch/e_exp.c index 9193e8bcdf..5979909a02 100644 --- a/sysdeps/x86_64/fpu/multiarch/e_exp.c +++ b/sysdeps/x86_64/fpu/multiarch/e_exp.c @@ -17,6 +17,7 @@ . */ #include +#include extern double __redirect_ieee754_exp (double); @@ -25,7 +26,7 @@ extern double __redirect_ieee754_exp (double); libc_ifunc_redirected (__redirect_ieee754_exp, __ieee754_exp, IFUNC_SELECTOR ()); -strong_alias (__ieee754_exp, __exp_finite) +libm_alias_finite (__ieee754_exp, __exp) #define __exp __ieee754_exp_sse2 #include diff --git a/sysdeps/x86_64/fpu/multiarch/e_exp2f.c b/sysdeps/x86_64/fpu/multiarch/e_exp2f.c index 3a90f5cd2d..ea4ae72318 100644 --- a/sysdeps/x86_64/fpu/multiarch/e_exp2f.c +++ b/sysdeps/x86_64/fpu/multiarch/e_exp2f.c @@ -17,6 +17,7 @@ . */ #include +#include extern float __redirect_exp2f (float); @@ -26,15 +27,14 @@ extern float __redirect_exp2f (float); libc_ifunc_redirected (__redirect_exp2f, __exp2f, IFUNC_SELECTOR ()); #ifdef SHARED -# include -versioned_symbol (libm, __exp2f, exp2f, GLIBC_2_27); +versioned_symbol (libm, __ieee754_exp2f, exp2f, GLIBC_2_27); libm_alias_float_other (__exp2, exp2) #else libm_alias_float (__exp2, exp2) #endif strong_alias (__exp2f, __ieee754_exp2f) -strong_alias (__exp2f, __exp2f_finite) +libm_alias_finite (__exp2f, __exp2f) #define __exp2f __exp2f_sse2 #include diff --git a/sysdeps/x86_64/fpu/multiarch/e_expf.c b/sysdeps/x86_64/fpu/multiarch/e_expf.c index 4ccee5bf13..f685f31089 100644 --- a/sysdeps/x86_64/fpu/multiarch/e_expf.c +++ b/sysdeps/x86_64/fpu/multiarch/e_expf.c @@ -17,6 +17,7 @@ . */ #include +#include extern float __redirect_expf (float); @@ -29,15 +30,14 @@ libc_ifunc_redirected (__redirect_expf, __expf, IFUNC_SELECTOR ()); __hidden_ver1 (__expf, __GI___expf, __redirect_expf) __attribute__ ((visibility ("hidden"))); -# include -versioned_symbol (libm, __expf, expf, GLIBC_2_27); +versioned_symbol (libm, __ieee754_expf, expf, GLIBC_2_27); libm_alias_float_other (__exp, exp) #else libm_alias_float (__exp, exp) #endif strong_alias (__expf, __ieee754_expf) -strong_alias (__expf, __expf_finite) +libm_alias_finite (__expf, __expf) #define __expf __expf_sse2 #include diff --git a/sysdeps/x86_64/fpu/multiarch/e_log.c b/sysdeps/x86_64/fpu/multiarch/e_log.c index 14c9a94510..81348627c2 100644 --- a/sysdeps/x86_64/fpu/multiarch/e_log.c +++ b/sysdeps/x86_64/fpu/multiarch/e_log.c @@ -17,6 +17,7 @@ . */ #include +#include extern double __redirect_ieee754_log (double); @@ -25,7 +26,7 @@ extern double __redirect_ieee754_log (double); libc_ifunc_redirected (__redirect_ieee754_log, __ieee754_log, IFUNC_SELECTOR ()); -strong_alias (__ieee754_log, __log_finite) +libm_alias_finite (__ieee754_log, __log) #define __log __ieee754_log_sse2 #include diff --git a/sysdeps/x86_64/fpu/multiarch/e_log2f.c b/sysdeps/x86_64/fpu/multiarch/e_log2f.c index 53f3d2ffc5..8410cbee0e 100644 --- a/sysdeps/x86_64/fpu/multiarch/e_log2f.c +++ b/sysdeps/x86_64/fpu/multiarch/e_log2f.c @@ -17,6 +17,7 @@ . */ #include +#include extern float __redirect_log2f (float); @@ -29,15 +30,14 @@ libc_ifunc_redirected (__redirect_log2f, __log2f, IFUNC_SELECTOR ()); __hidden_ver1 (__log2f, __GI___log2f, __redirect_log2f) __attribute__ ((visibility ("hidden"))); -# include -versioned_symbol (libm, __log2f, log2f, GLIBC_2_27); +versioned_symbol (libm, __ieee754_log2f, log2f, GLIBC_2_27); libm_alias_float_other (__log2, log2) #else libm_alias_float (__log2, log2) #endif strong_alias (__log2f, __ieee754_log2f) -strong_alias (__log2f, __log2f_finite) +libm_alias_finite (__log2f, __log2f) #define __log2f __log2f_sse2 #include diff --git a/sysdeps/x86_64/fpu/multiarch/e_logf.c b/sysdeps/x86_64/fpu/multiarch/e_logf.c index c03cc9464d..71faa7c587 100644 --- a/sysdeps/x86_64/fpu/multiarch/e_logf.c +++ b/sysdeps/x86_64/fpu/multiarch/e_logf.c @@ -17,6 +17,7 @@ . */ #include +#include extern float __redirect_logf (float); @@ -29,15 +30,14 @@ libc_ifunc_redirected (__redirect_logf, __logf, IFUNC_SELECTOR ()); __hidden_ver1 (__logf, __GI___logf, __redirect_logf) __attribute__ ((visibility ("hidden"))); -# include -versioned_symbol (libm, __logf, logf, GLIBC_2_27); +versioned_symbol (libm, __ieee754_logf, logf, GLIBC_2_27); libm_alias_float_other (__log, log) #else libm_alias_float (__log, log) #endif strong_alias (__logf, __ieee754_logf) -strong_alias (__logf, __logf_finite) +libm_alias_finite (__logf, __logf) #define __logf __logf_sse2 #include diff --git a/sysdeps/x86_64/fpu/multiarch/e_pow.c b/sysdeps/x86_64/fpu/multiarch/e_pow.c index 6636c75c2e..c96aedd9d6 100644 --- a/sysdeps/x86_64/fpu/multiarch/e_pow.c +++ b/sysdeps/x86_64/fpu/multiarch/e_pow.c @@ -17,6 +17,7 @@ . */ #include +#include extern double __redirect_ieee754_pow (double, double); @@ -25,7 +26,7 @@ extern double __redirect_ieee754_pow (double, double); libc_ifunc_redirected (__redirect_ieee754_pow, __ieee754_pow, IFUNC_SELECTOR ()); -strong_alias (__ieee754_pow, __pow_finite) +libm_alias_finite (__ieee754_pow, __pow) #define __pow __ieee754_pow_sse2 #include diff --git a/sysdeps/x86_64/fpu/multiarch/e_powf.c b/sysdeps/x86_64/fpu/multiarch/e_powf.c index d83585bfdd..c5bd42b099 100644 --- a/sysdeps/x86_64/fpu/multiarch/e_powf.c +++ b/sysdeps/x86_64/fpu/multiarch/e_powf.c @@ -17,6 +17,7 @@ . */ #include +#include #define powf __redirect_powf #define __DECL_SIMD___redirect_powf @@ -32,15 +33,14 @@ libc_ifunc_redirected (__redirect_powf, __powf, IFUNC_SELECTOR ()); __hidden_ver1 (__powf, __GI___powf, __redirect_powf) __attribute__ ((visibility ("hidden"))); -# include -versioned_symbol (libm, __powf, powf, GLIBC_2_27); +versioned_symbol (libm, __ieee754_powf, powf, GLIBC_2_27); libm_alias_float_other (__pow, pow) #else libm_alias_float (__pow, pow) #endif strong_alias (__powf, __ieee754_powf) -strong_alias (__powf, __powf_finite) +libm_alias_finite (__powf, __powf) #define __powf __powf_sse2 #include -- cgit 1.4.1