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/alpha/fpu/e_sqrtf.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'sysdeps/alpha/fpu/e_sqrtf.c') diff --git a/sysdeps/alpha/fpu/e_sqrtf.c b/sysdeps/alpha/fpu/e_sqrtf.c index ad523f5cf2..eb3f968576 100644 --- a/sysdeps/alpha/fpu/e_sqrtf.c +++ b/sysdeps/alpha/fpu/e_sqrtf.c @@ -1,14 +1,13 @@ #include -#if SHLIB_COMPAT (libm, GLIBC_2_15, GLIBC_2_18) -# define __sqrtf_finite __sqrtf_finite1 -#endif - +#define __ieee754_sqrtf __ieee754_sqrtf #include /* Work around forgotten symbol in alphaev6 build. */ #if SHLIB_COMPAT (libm, GLIBC_2_15, GLIBC_2_18) -# undef __sqrtf_finite -compat_symbol (libm, __sqrtf_finite1, __sqrtf_finite, GLIBC_2_15); -versioned_symbol (libm, __ieee754_sqrtf, __sqrtf_finite, GLIBC_2_18); +strong_alias(__ieee754_sqrtf, __sqrtf_dummy) +compat_symbol (libm, __sqrtf_dummy, __sqrtf_finite, GLIBC_2_15); +#endif +#if SHLIB_COMPAT (libm, GLIBC_2_18, GLIBC_2_31) +compat_symbol (libm, __ieee754_sqrtf, __sqrtf_finite, GLIBC_2_18); #endif -- cgit 1.4.1