diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-10-04 20:32:48 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-10-04 20:32:48 +0000 |
| commit | 7e16a5d1d19effc7b2775942f592520cfff03d92 (patch) | |
| tree | 03ee66322023d9264af573c97027cbba8296e51b | |
| parent | db4f87bad48ed93ae14f61121367a7cb94fa46ed (diff) | |
| download | glibc-7e16a5d1d19effc7b2775942f592520cfff03d92.tar.gz glibc-7e16a5d1d19effc7b2775942f592520cfff03d92.tar.xz glibc-7e16a5d1d19effc7b2775942f592520cfff03d92.zip | |
Use libm_alias_double for dbl-64 fma.
This patch makes dbl-64 fma use libm_alias_double. The ldbl-opt version is removed. The sparc32 version no longer needs to handle compat symbols, while alpha needs a new wrapper to avoid getting the ldbl-128 version (where ldbl-opt is earlier in the list of sysdeps directories, so previously fma came from there). Tested for x86_64, and tested with build-many-glibcs.py that installed stripped shared libraries are unchanged by the patch. * sysdeps/ieee754/dbl-64/s_fma.c: Include <libm-alias-double.h>. (fma): Define using libm_alias_double. * sysdeps/ieee754/ldbl-opt/s_fma.c: Remove file. * sysdeps/sparc/sparc32/fpu/s_fma.c: Do not include <math_ldbl_opt.h>. (fmal): Do not define as compat symbol here. * sysdeps/alpha/fpu/s_fma.c: New file.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | sysdeps/alpha/fpu/s_fma.c | 2 | ||||
| -rw-r--r-- | sysdeps/ieee754/dbl-64/s_fma.c | 8 | ||||
| -rw-r--r-- | sysdeps/ieee754/ldbl-opt/s_fma.c | 5 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc32/fpu/s_fma.c | 4 |
5 files changed, 14 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog index 23f2595bce..4d94f133dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2017-10-04 Joseph Myers <joseph@codesourcery.com> + + * sysdeps/ieee754/dbl-64/s_fma.c: Include <libm-alias-double.h>. + (fma): Define using libm_alias_double. + * sysdeps/ieee754/ldbl-opt/s_fma.c: Remove file. + * sysdeps/sparc/sparc32/fpu/s_fma.c: Do not include + <math_ldbl_opt.h>. + (fmal): Do not define as compat symbol here. + * sysdeps/alpha/fpu/s_fma.c: New file. + 2017-10-04 Szabolcs Nagy <szabolcs.nagy@arm.com> * sysdeps/aarch64/dl-machine.h (elf_machine_rela): Expand MIN. diff --git a/sysdeps/alpha/fpu/s_fma.c b/sysdeps/alpha/fpu/s_fma.c new file mode 100644 index 0000000000..8f62605870 --- /dev/null +++ b/sysdeps/alpha/fpu/s_fma.c @@ -0,0 +1,2 @@ +/* Always use dbl-64 version because long double is emulated in software. */ +#include <sysdeps/ieee754/dbl-64/s_fma.c> diff --git a/sysdeps/ieee754/dbl-64/s_fma.c b/sysdeps/ieee754/dbl-64/s_fma.c index 68c8515fb1..3a5a8858ce 100644 --- a/sysdeps/ieee754/dbl-64/s_fma.c +++ b/sysdeps/ieee754/dbl-64/s_fma.c @@ -22,6 +22,7 @@ #include <fenv.h> #include <ieee754.h> #include <math_private.h> +#include <libm-alias-double.h> #include <tininess.h> /* This implementation uses rounding to odd to avoid problems with @@ -292,10 +293,5 @@ __fma (double x, double y, double z) } } #ifndef __fma -weak_alias (__fma, fma) -#endif - -#ifdef NO_LONG_DOUBLE -strong_alias (__fma, __fmal) -weak_alias (__fmal, fmal) +libm_alias_double (__fma, fma) #endif diff --git a/sysdeps/ieee754/ldbl-opt/s_fma.c b/sysdeps/ieee754/ldbl-opt/s_fma.c deleted file mode 100644 index 1723c5c306..0000000000 --- a/sysdeps/ieee754/ldbl-opt/s_fma.c +++ /dev/null @@ -1,5 +0,0 @@ -#include <math_ldbl_opt.h> -#include <sysdeps/ieee754/dbl-64/s_fma.c> -#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1) -compat_symbol (libm, __fma, fmal, GLIBC_2_1); -#endif diff --git a/sysdeps/sparc/sparc32/fpu/s_fma.c b/sysdeps/sparc/sparc32/fpu/s_fma.c index bfdcb23b3a..8f62605870 100644 --- a/sysdeps/sparc/sparc32/fpu/s_fma.c +++ b/sysdeps/sparc/sparc32/fpu/s_fma.c @@ -1,6 +1,2 @@ /* Always use dbl-64 version because long double is emulated in software. */ -#include <math_ldbl_opt.h> #include <sysdeps/ieee754/dbl-64/s_fma.c> -#if LONG_DOUBLE_COMPAT (libm, GLIBC_2_1) -compat_symbol (libm, __fma, fmal, GLIBC_2_1); -#endif |