Fix makefile/configure problems with sse2avx changes.

diff --git a/ChangeLog b/ChangeLog
index 333d11447059272b2ded9eab652fdde628f74719..9ca578f94d5c5bcd9d85a2a3846d771167f253cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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-29  Chris Metcalf  <cmetcalf@tilera.com>
 
        * scripts/config.guess: Update from upstream config git repository.

diff --git a/config.make.in b/config.make.in
index d9379521a3b669f494734a926e903dc46090d503..75061f6d50558335c47def9a54400fcac26314d9 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 71e8de1c490f29251497c6beed344262662f85b3..508e1bb58cb2c6fbeaa929f8ce22a5b207d7df2a 100755 (executable)
--- a/configure
+++ b/configure
@@ -620,6 +620,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
@@ -7641,6 +7642,7 @@ fi
 
 
 
+
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -fPIC is default" >&5

diff --git a/configure.in b/configure.in
index 5fd6d85426b9741764717267c75f0d20a791790b..0499d3c2d41319f37e2c502226b123a562a9b885 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2154,6 +2154,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