diff options
| author | Wilco Dijkstra <Wilco.Dijkstra@arm.com> | 2019-07-16 12:17:22 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-01-03 10:02:04 -0300 |
| commit | 220622dde5704c95a100c2792a280f18f3deba73 (patch) | |
| tree | fbf0df37c2671a9bc21a200bd2f587fc5e4cbe2b /sysdeps/alpha/fpu | |
| parent | cf4dfd461725b6dbe6f27fbd16913f2c6c5cf7c5 (diff) | |
| download | glibc-220622dde5704c95a100c2792a280f18f3deba73.tar.gz | |
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 <fn>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 <adhemerval.zanella@linaro.org>
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
Diffstat (limited to 'sysdeps/alpha/fpu')
| -rw-r--r-- | sysdeps/alpha/fpu/e_sqrt.c | 23 | ||||
| -rw-r--r-- | sysdeps/alpha/fpu/e_sqrtf.c | 13 |
2 files changed, 17 insertions, 19 deletions
diff --git a/sysdeps/alpha/fpu/e_sqrt.c b/sysdeps/alpha/fpu/e_sqrt.c index 645330852a..4cf2ad693a 100644 --- a/sysdeps/alpha/fpu/e_sqrt.c +++ b/sysdeps/alpha/fpu/e_sqrt.c @@ -158,30 +158,29 @@ $fixup: \n\ \n\ .end __ieee754_sqrt"); -/* Avoid the __sqrt_finite alias that dbl-64/e_sqrt.c would give... */ -#undef strong_alias -#define strong_alias(a,b) - -/* ... defining our own. */ #if SHLIB_COMPAT (libm, GLIBC_2_15, GLIBC_2_18) -asm (".global __sqrt_finite1; __sqrt_finite1 = __ieee754_sqrt"); +asm (".global __sqrt_dummy; __sqrt_dummy = __ieee754_sqrt"); #else -asm (".global __sqrt_finite; __sqrt_finite = __ieee754_sqrt"); +asm (".global __sqrt_finite; __sqrt_finite = __ieee754_sqrt"); #endif static double __full_ieee754_sqrt(double) __attribute_used__; #define __ieee754_sqrt __full_ieee754_sqrt #elif SHLIB_COMPAT (libm, GLIBC_2_15, GLIBC_2_18) -# define __sqrt_finite __sqrt_finite1 + +strong_alias (__ieee754_sqrt, __sqrt_dummy) +#define __ieee754_sqrt __ieee754_sqrt + #endif /* _IEEE_FP_INEXACT */ #include <sysdeps/ieee754/dbl-64/e_sqrt.c> +#undef __ieee754_sqrt /* Work around forgotten symbol in alphaev6 build. */ #if SHLIB_COMPAT (libm, GLIBC_2_15, GLIBC_2_18) -# undef __sqrt_finite -# undef __ieee754_sqrt -compat_symbol (libm, __sqrt_finite1, __sqrt_finite, GLIBC_2_15); -versioned_symbol (libm, __ieee754_sqrt, __sqrt_finite, GLIBC_2_18); +compat_symbol (libm, __sqrt_dummy, __sqrt_finite, GLIBC_2_15); +#endif +#if SHLIB_COMPAT (libm, GLIBC_2_18, GLIBC_2_31) +compat_symbol (libm, __ieee754_sqrt, __sqrt_finite, GLIBC_2_18); #endif 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 <shlib-compat.h> -#if SHLIB_COMPAT (libm, GLIBC_2_15, GLIBC_2_18) -# define __sqrtf_finite __sqrtf_finite1 -#endif - +#define __ieee754_sqrtf __ieee754_sqrtf #include <sysdeps/ieee754/flt-32/e_sqrtf.c> /* 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 |