From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 17 Apr 2004 22:44:55 +0000 (+0000)
Subject: Fix.
X-Git-Tag: cvs/fedora-base~521
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5339290658a4c9e8c8d9e6d95ae27705fdd59c10;p=thirdparty%2Fglibc.git

Fix.

	* sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S: Remove unneeded
	frame info.
	* sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S: Likewise.
---

diff --git a/Makeconfig b/Makeconfig
index 37bbb1df4c2..ce84c756242 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -520,7 +520,7 @@ ifndef gnulib
 ifneq ($(have-as-needed),yes)
  libgcc_eh := -lgcc_eh
 else
- libgcc_eh := --as-needed -lgcc_s --no-as-needed
+ libgcc_eh := -Wl,--as-needed -lgcc_s -Wl,--no-as-needed
 endif
 ifneq ($(have-cc-with-libunwind),yes)
  gnulib := -lgcc $(libgcc_eh)
diff --git a/configure b/configure
index 17268e0d95e..01cd5168415 100755
--- a/configure
+++ b/configure
@@ -5565,7 +5565,7 @@ else
 int main (void) { return 0; }
 EOF
   if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-			      -shared -o conftest.so conftest.c
+			      -shared -o conftest.so conftest.c -lgcc_s
 			      -Wl,--as-needed -nostdlib 1>&5'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
diff --git a/configure.in b/configure.in
index 1f038545345..082aa1ac42d 100644
--- a/configure.in
+++ b/configure.in
@@ -1321,7 +1321,7 @@ EOF
 int main (void) { return 0; }
 EOF
   if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-			      -shared -o conftest.so conftest.c
+			      -shared -o conftest.so conftest.c -lgcc_s
 			      -Wl,--as-needed -nostdlib 1>&AS_MESSAGE_LOG_FD])
   then
     libc_cv_as_needed=yes
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 4d07dac5eed..7225ad50575 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,7 +1,8 @@
 2004-04-16  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
 
-	* sysv/linux/sh/pthread_cond_wait.S: Remove unneeded frame info.
-	* sysv/linux/sh/pthread_cond_timedwait.S: Likewise.
+	* sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S: Remove unneeded
+	frame info.
+	* sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S: Likewise.
 
 2004-04-15  Jakub Jelinek  <jakub@redhat.com>