Fix makefile/configure problems with sse2avx changes.

(cherry picked from commit 3b1004624e54cc2fefd034ff80d5dea4b6db764f)

diff --git a/ChangeLog b/ChangeLog
index fbbcd0a3131ab7292526359a3ff693bf8d910bf1..42d089685aef0e353ec2c2356411779d0b1a3218 100644 (file)
--- 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 d2baf6d3a95fbd75c91ded73c34d9d937b72fdc3..75b9a1975f307d74f88e19879005d93fa867f213 100644 (file)
--- 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 c22ed3807bc8a8291541ac219f47855772d32839..1d44f7d7fb7688f61ab6c8a5b495fb5e80dc8b88 100755 (executable)
--- 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 2c4fc97df84d7e721b447e67add2777e32d5434a..6b57c8db07be2b019e5d9d76eac50e5486f2525e 100644 (file)
--- 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 4b5c173145a8363231daf845d88dda548bd74123..2a38ffc76499202a42321ca4aa8e062d46a384d9 100644 (file)
--- 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