Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker

1 files changed, 3 insertions, 17 deletions

diff --git a/configure b/configure
index d076226f96..e5b541d6df 100755
--- a/configure
+++ b/configure
@@ -581,19 +581,12 @@ shared
 static
 ldd_rewrite_script
 use_ldconfig
-libc_cv_sparc_as_vis3
-libc_cv_as_i686
-libc_cv_cc_nofma
-libc_cv_cc_fma4
-libc_cv_cc_novzeroupper
-libc_cv_cc_sse2avx
-libc_cv_cc_avx
-libc_cv_cc_sse4
 libc_cv_forced_unwind
 libc_cv_rootsbindir
 libc_cv_localstatedir
 libc_cv_sysconfdir
 libc_cv_localedir
+libc_cv_rtlddir
 libc_cv_slibdir
 old_glibc_headers
 use_nscd
@@ -606,6 +599,7 @@ have_libcap
 have_libaudit
 LIBGD
 libc_cv_cc_submachine
+libc_cv_cc_nofma
 exceptions
 gnu89_inline
 libc_cv_ssp
@@ -638,7 +632,6 @@ MSGFMT
 MAKE
 LD
 AS
-MIG
 OBJCOPY
 OBJDUMP
 AR
@@ -6912,6 +6905,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_cc_nofma" >&5
 $as_echo "$libc_cv_cc_nofma" >&6; }
 
+
 if test -n "$submachine"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler option for CPU variant" >&5
 $as_echo_n "checking for compiler option for CPU variant... " >&6; }
@@ -7367,14 +7361,6 @@ fi
 
 
 
-
-
-
-
-
-
-
-
 if test x$use_ldconfig = xyes; then
   $as_echo "#define USE_LDCONFIG 1" >>confdefs.h