From 3a533ca370725b68b516e6b74adf4727d17ed28a Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Tue, 24 Apr 2012 10:22:45 +0000
Subject: Don't handle libgcc_s suffixes.

---
 ChangeLog      |  9 +++++++++
 Makeconfig     |  2 +-
 config.make.in |  1 -
 configure      | 21 +--------------------
 configure.in   | 16 +---------------
 5 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1152f8c690..ca5dd2e31d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-04-24  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.in (libc_cv_libgcc_s_suffix): Remove test.
+	(libc_cv_as_needed): Don't use $libc_cv_libgcc_s_suffix.
+	* configure: Regenerated.
+	* Makeconfig [$(have-as-needed) = yes] (libgcc_eh): Don't use
+	$(libgcc_s_suffix).
+	* config.make.in (libgcc_s_suffix): Remove variable.
+
 2012-04-23  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/unix/sysv/gethostname.c: Move to ...
diff --git a/Makeconfig b/Makeconfig
index 4fc1141299..4364296b3c 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -537,7 +537,7 @@ endif
 ifneq ($(have-as-needed),yes)
  libgcc_eh := -lgcc_eh $(libunwind)
 else
- libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed
+ libgcc_eh := -Wl,--as-needed -lgcc_s $(libunwind) -Wl,--no-as-needed
 endif
 gnulib := -lgcc $(libgcc_eh)
 static-gnulib := -lgcc -lgcc_eh $(libunwind)
diff --git a/config.make.in b/config.make.in
index 54e83934af..0cea3a460e 100644
--- a/config.make.in
+++ b/config.make.in
@@ -50,7 +50,6 @@ have-z-combreloc = @libc_cv_z_combreloc@
 have-z-execstack = @libc_cv_z_execstack@
 have-Bgroup = @libc_cv_Bgroup@
 have-as-needed = @libc_cv_as_needed@
-libgcc_s_suffix = @libc_cv_libgcc_s_suffix@
 with-fp = @with_fp@
 old-glibc-headers = @old_glibc_headers@
 unwind-find-fde = @libc_cv_gcc_unwind_find_fde@
diff --git a/configure b/configure
index 3d54d72dac..9cfccb2f9f 100755
--- a/configure
+++ b/configure
@@ -651,7 +651,6 @@ libc_cv_z_execstack
 libc_cv_z_combreloc
 ASFLAGS_config
 libc_cv_as_needed
-libc_cv_libgcc_s_suffix
 libc_cv_Bgroup
 libc_cv_cc_with_libunwind
 VERSIONING
@@ -6305,24 +6304,6 @@ fi
 $as_echo "$libc_cv_Bgroup" >&6; }
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgcc_s suffix" >&5
-$as_echo_n "checking for libgcc_s suffix... " >&6; }
-if ${libc_cv_libgcc_s_suffix+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat > conftest.c <<EOF
-int main (void) { return 0; }
-EOF
-libc_cv_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \
-			   -fPIC -shared -shared-libgcc -o conftest.so \
-			   conftest.c -v 2>&1 >/dev/null \
-			   | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'`
-rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_libgcc_s_suffix" >&5
-$as_echo "$libc_cv_libgcc_s_suffix" >&6; }
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --as-needed option" >&5
 $as_echo_n "checking for --as-needed option... " >&6; }
 if ${libc_cv_as_needed+:} false; then :
@@ -6333,7 +6314,7 @@ int main (void) { return 0; }
 EOF
 if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
 			      -fPIC -shared -o conftest.so conftest.c
-			      -lgcc_s$libc_cv_libgcc_s_suffix -Wl,--as-needed
+			      -lgcc_s -Wl,--as-needed
 			      -nostdlib 1>&5'
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
diff --git a/configure.in b/configure.in
index d8c55b102e..442f8eb503 100644
--- a/configure.in
+++ b/configure.in
@@ -1519,20 +1519,6 @@ fi
 rm -f conftest*])
 AC_SUBST(libc_cv_Bgroup)
 
-AC_CACHE_CHECK(for libgcc_s suffix,
-	       libc_cv_libgcc_s_suffix, [dnl
-cat > conftest.c <<EOF
-int main (void) { return 0; }
-EOF
-changequote(,)dnl
-libc_cv_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \
-			   -fPIC -shared -shared-libgcc -o conftest.so \
-			   conftest.c -v 2>&1 >/dev/null \
-			   | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'`
-changequote([,])dnl
-rm -f conftest*])
-AC_SUBST(libc_cv_libgcc_s_suffix)
-
 AC_CACHE_CHECK(for --as-needed option,
 	       libc_cv_as_needed, [dnl
 cat > conftest.c <<EOF
@@ -1540,7 +1526,7 @@ int main (void) { return 0; }
 EOF
 if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
 			      -fPIC -shared -o conftest.so conftest.c
-			      -lgcc_s$libc_cv_libgcc_s_suffix -Wl,--as-needed
+			      -lgcc_s -Wl,--as-needed
 			      -nostdlib 1>&AS_MESSAGE_LOG_FD])
 then
   libc_cv_as_needed=yes
-- 
cgit v1.2.3