From f7d82dc9e0b812c30ed1935190cda11a171b1438 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@gmail.com>
Date: Sat, 21 May 2011 08:00:14 -0400
Subject: [PATCH] Fix configure visibility tests

---
 ChangeLog    | 3 +++
 configure    | 6 +++---
 configure.in | 8 ++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7a91156ba2..2fac3560d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-05-21  Ulrich Drepper  <drepper@gmail.com>
 
+	* configure.in: Fix typo in redirection and correct removal of test
+	files in two cases.
+
 	[BZ #12788]
 	* locale/setlocale.c (new_composite_name): Fix test to check for
 	identical name of all categories.
diff --git a/configure b/configure
index fdfa5effc0..6cf85e52ed 100755
--- a/configure
+++ b/configure
@@ -5963,7 +5963,7 @@ EOF
 		      fi
 		    fi
 		  fi
-		  rm -f conftest.cs
+		  rm -f conftest.{c,s}
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_visibility_attribute" >&5
@@ -5985,7 +5985,7 @@ else
 		  int bar (int x) { return x; }
 EOF
 		  libc_cv_broken_visibility_attribute=yes
-		  if { ac_try='${CC-cc} -Werror -S conftest.c -o conftest.s1>&5'
+		  if { ac_try='${CC-cc} -Werror -S conftest.c -o conftest.s 1>&5'
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6626,7 +6626,7 @@ EOF
 		  else
 		    libc_cv_have_section_quotes=unknown
 		  fi
-		  rm -f conftest.cs
+		  rm -f conftest.{c,s}
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_have_section_quotes" >&5
diff --git a/configure.in b/configure.in
index e5ff6bdb10..fbc64b9a7e 100644
--- a/configure.in
+++ b/configure.in
@@ -1388,7 +1388,7 @@ EOF
 		      fi
 		    fi
 		  fi
-		  rm -f conftest.[cs]
+		  rm -f conftest.{c,s}
 		 ])
     if test $libc_cv_visibility_attribute != yes; then
       AC_MSG_ERROR(compiler support for visibility attribute is required)
@@ -1404,7 +1404,7 @@ EOF
 		  int bar (int x) { return x; }
 EOF
 		  libc_cv_broken_visibility_attribute=yes
-		  if AC_TRY_COMMAND(${CC-cc} -Werror -S conftest.c -o conftest.s1>&AS_MESSAGE_LOG_FD); then
+		  if AC_TRY_COMMAND(${CC-cc} -Werror -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD); then
 changequote(,)dnl
 		    if grep '\.hidden[ 	_]foo' conftest.s >/dev/null; then
 changequote([,])dnl
@@ -1806,7 +1806,7 @@ EOF
 		  else
 		    libc_cv_have_section_quotes=unknown
 		  fi
-		  rm -f conftest.[cs]
+		  rm -f conftest.{c,s}
 		 ])
   if test $libc_cv_have_section_quotes = yes; then
     AC_DEFINE(HAVE_SECTION_QUOTES)
@@ -2080,7 +2080,7 @@ fi
 
 if test -n "$submachine"; then
   AC_CACHE_CHECK([for compiler option for CPU variant],
-  		 libc_cv_cc_submachine, [dnl
+		 libc_cv_cc_submachine, [dnl
   libc_cv_cc_submachine=no
   for opt in "-march=$submachine" "-mcpu=$submachine"; do
     if AC_TRY_COMMAND([${CC-cc} $opt -xc /dev/null -S -o /dev/null]); then