From 0ddde474db4e466a991652049888b7dbb8515f69 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 1 Dec 2017 23:58:05 +0000 Subject: Define powerpc64 lroundl compat symbol only once. sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c defines the lroundl compat symbol, version GLIBC_2_1, twice, once based on llround and once based on __lround. Those are aliases for each other (llround weak, __lround strong), but defining it twice does not make sense. This patch changes it to define the compat symbol once only, matching how libm_alias_double defines it. Tested with build-many-glibcs.py for its powerpc64 configurations. * sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c [LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)] (lroundl): Do not define compat symbol based on llround. --- ChangeLog | 4 ++++ sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9bc63761d6..e65ca614f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2017-12-01 Joseph Myers + * sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c + [LONG_DOUBLE_COMPAT(libm, GLIBC_2_1)] (lroundl): Do not define + compat symbol based on llround. + * sysdeps/powerpc/power7/fpu/s_logb.c [LONG_DOUBLE_COMPAT (libm, GLIBC_2_0)] (logbl): Define as compat symbol based on __logb, not on logb. diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c index cb1a446158..b6c70c20ab 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c @@ -46,7 +46,6 @@ strong_alias (__llround, __llroundl) #endif #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1) compat_symbol (libm, __llround, llroundl, GLIBC_2_1); -compat_symbol (libm, llround, lroundl, GLIBC_2_1); #endif /* long has the same width as long long on PPC64. */ -- cgit 1.4.1