diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2015-08-20 08:56:52 -0700 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2015-08-27 09:35:11 -0700 |
commit | 377adacbaaa3974408b708a20912474e45cd383b (patch) | |
tree | a35dca8f41b4daacdeb6e439cc45d3c376a417d8 | |
parent | e6a76afbe075a9b838580390ce90cf06af310e81 (diff) | |
download | glibc-377adacbaaa3974408b708a20912474e45cd383b.tar.gz glibc-377adacbaaa3974408b708a20912474e45cd383b.tar.xz glibc-377adacbaaa3974408b708a20912474e45cd383b.zip |
Add i386 s_fma family multiarch functions
-rw-r--r-- | sysdeps/i386/i686/multiarch/Makefile | 6 | ||||
-rw-r--r-- | sysdeps/i386/multiarch/Makefile | 6 | ||||
-rw-r--r-- | sysdeps/i386/multiarch/s_fma-fma.c (renamed from sysdeps/i386/i686/multiarch/s_fma-fma.c) | 0 | ||||
-rw-r--r-- | sysdeps/i386/multiarch/s_fma.c (renamed from sysdeps/i386/i686/multiarch/s_fma.c) | 6 | ||||
-rw-r--r-- | sysdeps/i386/multiarch/s_fmaf-fma.c (renamed from sysdeps/i386/i686/multiarch/s_fmaf-fma.c) | 0 | ||||
-rw-r--r-- | sysdeps/i386/multiarch/s_fmaf.c (renamed from sysdeps/i386/i686/multiarch/s_fmaf.c) | 6 |
6 files changed, 12 insertions, 12 deletions
diff --git a/sysdeps/i386/i686/multiarch/Makefile b/sysdeps/i386/i686/multiarch/Makefile index 74333caee5..101bb7d4c3 100644 --- a/sysdeps/i386/i686/multiarch/Makefile +++ b/sysdeps/i386/i686/multiarch/Makefile @@ -25,9 +25,3 @@ sysdep_routines += wcscmp-sse2 wcscmp-c wcslen-sse2 wcslen-c \ wmemcmp-sse4 wmemcmp-ssse3 wmemcmp-c wcschr-sse2 \ wcschr-c wcsrchr-sse2 wcsrchr-c wcscpy-ssse3 wcscpy-c endif - -ifeq (mathyes,$(subdir)$(config-cflags-avx)) -libm-sysdep_routines += s_fma-fma s_fmaf-fma -CFLAGS-s_fma-fma.c += -mavx -mfpmath=sse -CFLAGS-s_fmaf-fma.c += -mavx -mfpmath=sse -endif diff --git a/sysdeps/i386/multiarch/Makefile b/sysdeps/i386/multiarch/Makefile index 8a9ecf3a3a..32d37832f4 100644 --- a/sysdeps/i386/multiarch/Makefile +++ b/sysdeps/i386/multiarch/Makefile @@ -23,3 +23,9 @@ sysdep_routines += bcopy-i386 bcopy-i686 bcopy-sse2-unaligned \ memrchr-i386 memrchr-sse2-bsf memrchr-sse2 \ rawmemchr-sse2-bsf rawmemchr-sse2 endif + +ifeq (mathyes,$(subdir)$(config-cflags-avx)) +libm-sysdep_routines += s_fma-fma s_fmaf-fma +CFLAGS-s_fma-fma.c += -mavx -mfpmath=sse +CFLAGS-s_fmaf-fma.c += -mavx -mfpmath=sse +endif diff --git a/sysdeps/i386/i686/multiarch/s_fma-fma.c b/sysdeps/i386/multiarch/s_fma-fma.c index 1a8b48bd58..1a8b48bd58 100644 --- a/sysdeps/i386/i686/multiarch/s_fma-fma.c +++ b/sysdeps/i386/multiarch/s_fma-fma.c diff --git a/sysdeps/i386/i686/multiarch/s_fma.c b/sysdeps/i386/multiarch/s_fma.c index cf2ede5309..ab4d8c3af8 100644 --- a/sysdeps/i386/i686/multiarch/s_fma.c +++ b/sysdeps/i386/multiarch/s_fma.c @@ -23,14 +23,14 @@ #include <math.h> #include <init-arch.h> -extern double __fma_ia32 (double x, double y, double z) attribute_hidden; +extern double __fma_i386 (double x, double y, double z) attribute_hidden; extern double __fma_fma (double x, double y, double z) attribute_hidden; libm_ifunc (__fma, - HAS_ARCH_FEATURE (FMA_Usable) ? __fma_fma : __fma_ia32); + HAS_ARCH_FEATURE (FMA_Usable) ? __fma_fma : __fma_i386); weak_alias (__fma, fma) -# define __fma __fma_ia32 +# define __fma __fma_i386 #endif #include <sysdeps/ieee754/ldbl-96/s_fma.c> diff --git a/sysdeps/i386/i686/multiarch/s_fmaf-fma.c b/sysdeps/i386/multiarch/s_fmaf-fma.c index 1775ef5dd0..1775ef5dd0 100644 --- a/sysdeps/i386/i686/multiarch/s_fmaf-fma.c +++ b/sysdeps/i386/multiarch/s_fmaf-fma.c diff --git a/sysdeps/i386/i686/multiarch/s_fmaf.c b/sysdeps/i386/multiarch/s_fmaf.c index 526cdf16e4..3c9af052fc 100644 --- a/sysdeps/i386/i686/multiarch/s_fmaf.c +++ b/sysdeps/i386/multiarch/s_fmaf.c @@ -23,14 +23,14 @@ #include <math.h> #include <init-arch.h> -extern float __fmaf_ia32 (float x, float y, float z) attribute_hidden; +extern float __fmaf_i386 (float x, float y, float z) attribute_hidden; extern float __fmaf_fma (float x, float y, float z) attribute_hidden; libm_ifunc (__fmaf, - HAS_ARCH_FEATURE (FMA_Usable) ? __fmaf_fma : __fmaf_ia32); + HAS_ARCH_FEATURE (FMA_Usable) ? __fmaf_fma : __fmaf_i386); weak_alias (__fmaf, fmaf) -# define __fmaf __fmaf_ia32 +# define __fmaf __fmaf_i386 #endif #include <sysdeps/ieee754/dbl-64/s_fmaf.c> |