diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | sysdeps/ieee754/dbl-64/s_modf.c | 7 | ||||
| -rw-r--r-- | sysdeps/ieee754/dbl-64/wordsize-64/s_modf.c | 7 | ||||
| -rw-r--r-- | sysdeps/ieee754/ldbl-opt/s_modf.c | 6 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_modf-ppc32.c | 5 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf-ppc64.c | 5 |
6 files changed, 21 insertions, 23 deletions
@@ -1,5 +1,19 @@ 2017-10-03 Joseph Myers <joseph@codesourcery.com> + * sysdeps/ieee754/dbl-64/s_modf.c: Include <libm-alias-double.h>. + (modf): Define using libm_alias_double, only if [!__modf]. + * sysdeps/ieee754/dbl-64/wordsize-64/s_modf.c: Include + <libm-alias-double.h>. + (modf): Define using libm_alias_double, only if [!__modf]. + * sysdeps/ieee754/ldbl-opt/s_modf.c (modfl): Only define libc + compat symbol here. + * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_modf-ppc32.c + (weak_alias): Do not undefine and redefine. + (strong_alias): Likewise. + * sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf-ppc64.c + (weak_alias): Likewise. + (strong_alias): Likewise. + * sysdeps/ieee754/dbl-64/s_logb.c: Include <libm-alias-double.h>. (logb): Define using libm_alias_double, only if [!__logb]. * sysdeps/ieee754/dbl-64/wordsize-64/s_logb.c: Include diff --git a/sysdeps/ieee754/dbl-64/s_modf.c b/sysdeps/ieee754/dbl-64/s_modf.c index 0cad7b16a7..722511c64a 100644 --- a/sysdeps/ieee754/dbl-64/s_modf.c +++ b/sysdeps/ieee754/dbl-64/s_modf.c @@ -21,6 +21,7 @@ #include <math.h> #include <math_private.h> +#include <libm-alias-double.h> static const double one = 1.0; @@ -79,8 +80,6 @@ __modf (double x, double *iptr) } } } -weak_alias (__modf, modf) -#ifdef NO_LONG_DOUBLE -strong_alias (__modf, __modfl) -weak_alias (__modf, modfl) +#ifndef __modf +libm_alias_double (__modf, modf) #endif diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_modf.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_modf.c index c309e56272..8d14e78ef0 100644 --- a/sysdeps/ieee754/dbl-64/wordsize-64/s_modf.c +++ b/sysdeps/ieee754/dbl-64/wordsize-64/s_modf.c @@ -22,6 +22,7 @@ #include <math.h> #include <math_private.h> +#include <libm-alias-double.h> #include <stdint.h> static const double one = 1.0; @@ -59,8 +60,6 @@ __modf(double x, double *iptr) return x; } } -weak_alias (__modf, modf) -#ifdef NO_LONG_DOUBLE -strong_alias (__modf, __modfl) -weak_alias (__modf, modfl) +#ifndef __modf +libm_alias_double (__modf, modf) #endif diff --git a/sysdeps/ieee754/ldbl-opt/s_modf.c b/sysdeps/ieee754/ldbl-opt/s_modf.c index 93acb43ae6..268a728e9b 100644 --- a/sysdeps/ieee754/ldbl-opt/s_modf.c +++ b/sysdeps/ieee754/ldbl-opt/s_modf.c @@ -1,9 +1,5 @@ #include <math_ldbl_opt.h> #include <sysdeps/ieee754/dbl-64/s_modf.c> -#if IS_IN (libm) -# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0) -compat_symbol (libm, __modf, modfl, GLIBC_2_0); -# endif -#elif LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) +#if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0) compat_symbol (libc, __modf, modfl, GLIBC_2_0); #endif diff --git a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_modf-ppc32.c b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_modf-ppc32.c index 6561fdf8e1..554dc99545 100644 --- a/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_modf-ppc32.c +++ b/sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_modf-ppc32.c @@ -19,11 +19,6 @@ #include <math.h> #include <math_ldbl_opt.h> -#undef weak_alias -#define weak_alias(a,b) -#undef strong_alias -#define strong_alias(a,b) - #define __modf __modf_ppc32 #include <sysdeps/ieee754/dbl-64/s_modf.c> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf-ppc64.c b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf-ppc64.c index 43318ee4dd..7b5656d807 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf-ppc64.c +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf-ppc64.c @@ -19,11 +19,6 @@ #include <math.h> #include <math_ldbl_opt.h> -#undef weak_alias -#define weak_alias(a,b) -#undef strong_alias -#define strong_alias(a,b) - #define __modf __modf_ppc64 #include <sysdeps/ieee754/dbl-64/s_modf.c> |