diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-01-30 19:55:15 +0000 |
|---|---|---|
| committer | Carlos O'Donell <carlos_odonell@mentor.com> | 2012-05-25 07:09:15 -0400 |
| commit | ddeb5e27dda7dafc43a255c849213ce538cdee0d (patch) | |
| tree | ea4d1bb5199402b32aac3c44726ad2bc158dc148 | |
| parent | e3d5df796c656c69e60b504eed77cf60a08e18ef (diff) | |
| download | glibc-ddeb5e27dda7dafc43a255c849213ce538cdee0d.tar.gz glibc-ddeb5e27dda7dafc43a255c849213ce538cdee0d.tar.xz glibc-ddeb5e27dda7dafc43a255c849213ce538cdee0d.zip | |
Fix makefile/configure problems with sse2avx changes.
(cherry picked from commit 3b1004624e54cc2fefd034ff80d5dea4b6db764f)
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | config.make.in | 1 | ||||
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | sysdeps/x86_64/fpu/multiarch/Makefile | 2 |
5 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index fbbcd0a313..42d089685a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -137,6 +137,14 @@ ARENA_TEST says not to. Simplify test for creation of a new arena. Partially based on a patch by Siddhesh Poyarekar <siddhesh@redhat.com>. +2012-01-30 Joseph Myers <joseph@codesourcery.com> + + * configure.in (libc_cv_cc_sse2avx): AC_SUBST. + * configure: Regenerate. + * config.make.in (config-cflags-sse2avx): Define. + * sysdeps/x86_64/fpu/multiarch/Makefile (CFLAGS-slowexp-avx.c): + Fix typo. + 2012-01-28 Ulrich Drepper <drepper@gmail.com> * config.h.in: Define HAVE_SSE2AVX_SUPPORT. diff --git a/config.make.in b/config.make.in index d2baf6d3a9..75b9a1975f 100644 --- a/config.make.in +++ b/config.make.in @@ -36,6 +36,7 @@ asflags-cpu = @libc_cv_cc_submachine@ config-cflags-sse4 = @libc_cv_cc_sse4@ config-cflags-avx = @libc_cv_cc_avx@ +config-cflags-sse2avx = @libc_cv_cc_sse2avx@ config-cflags-novzeroupper = @libc_cv_cc_novzeroupper@ config-asflags-i686 = @libc_cv_as_i686@ diff --git a/configure b/configure index c22ed3807b..1d44f7d7fb 100755 --- a/configure +++ b/configure @@ -624,6 +624,7 @@ use_ldconfig libc_cv_as_i686 libc_cv_cc_fma4 libc_cv_cc_novzeroupper +libc_cv_cc_sse2avx libc_cv_cc_avx libc_cv_cc_sse4 libc_cv_cpp_asm_debuginfo diff --git a/configure.in b/configure.in index 2c4fc97df8..6b57c8db07 100644 --- a/configure.in +++ b/configure.in @@ -2337,6 +2337,7 @@ dnl sysdeps/CPU/configure.in checks set this via arch-specific asm tests AC_SUBST(libc_cv_cpp_asm_debuginfo) AC_SUBST(libc_cv_cc_sse4) AC_SUBST(libc_cv_cc_avx) +AC_SUBST(libc_cv_cc_sse2avx) AC_SUBST(libc_cv_cc_novzeroupper) AC_SUBST(libc_cv_cc_fma4) AC_SUBST(libc_cv_as_i686) diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile index 4b5c173145..2a38ffc764 100644 --- a/sysdeps/x86_64/fpu/multiarch/Makefile +++ b/sysdeps/x86_64/fpu/multiarch/Makefile @@ -48,7 +48,7 @@ CFLAGS-mpexp-avx.c = -msse2avx -DSSE2AVX CFLAGS-mplog-avx.c = -msse2avx -DSSE2AVX CFLAGS-s_atan-avx.c = -msse2avx -DSSE2AVX CFLAGS-s_sin-avx.c = -msse2avx -DSSE2AVX -CFLAGS-slowexp-avx.c = -sse2mavx -DSSE2AVX +CFLAGS-slowexp-avx.c = -msse2avx -DSSE2AVX CFLAGS-s_tan-avx.c = -msse2avx -DSSE2AVX endif endif |