[commits] r9187 - in /fsf/trunk/libc: ./ nptl/ nptl/sysdeps/pthread/ sysdeps/generic/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Nov  4 00:04:03 2009
New Revision: 9187

Log:
Import glibc-mainline for 2009-11-04

Added:
    fsf/trunk/libc/sysdeps/generic/libgcc_s.h
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/sysdeps/pthread/unwind-forcedunwind.c
    fsf/trunk/libc/nptl/sysdeps/pthread/unwind-resume.c
    fsf/trunk/libc/sysdeps/generic/framestate.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Nov  4 00:04:03 2009
@@ -1,3 +1,9 @@
+2009-11-03  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	[BZ #4457]
+	* sysdeps/generic/libgcc_s.h: New file.
+	* sysdeps/generic/framestate.c: Include it and use LIBGCC_S_SO.
+
 2009-11-01  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* malloc/hooks.c (free_check): Restore locking and call _int_free

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Wed Nov  4 00:04:03 2009
@@ -1,3 +1,10 @@
+2009-11-03  Andreas Schwab  <schwab@xxxxxxxxxxxxxx>
+
+	[BZ #4457]
+	* sysdeps/pthread/unwind-resume.c: Include <libgcc_s.h> and use
+	LIBGCC_S_SO.
+	* sysdeps/pthread/unwind-forcedunwind.c: Likewise.
+
 2009-10-30  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* tst-sem11.c (main): Rewrite to avoid aliasing problems.

Modified: fsf/trunk/libc/nptl/sysdeps/pthread/unwind-forcedunwind.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/pthread/unwind-forcedunwind.c (original)
+++ fsf/trunk/libc/nptl/sysdeps/pthread/unwind-forcedunwind.c Wed Nov  4 00:04:03 2009
@@ -22,6 +22,7 @@
 #include <unwind.h>
 #include <pthreadP.h>
 #include <sysdep.h>
+#include <libgcc_s.h>
 
 static void *libgcc_s_handle;
 static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
@@ -49,7 +50,7 @@
       return;
     }
 
-  handle = __libc_dlopen ("libgcc_s.so.1");
+  handle = __libc_dlopen (LIBGCC_S_SO);
 
   if (handle == NULL
       || (resume = __libc_dlsym (handle, "_Unwind_Resume")) == NULL
@@ -61,7 +62,7 @@
       || ARCH_CANCEL_INIT (handle)
 #endif
       )
-    __libc_fatal ("libgcc_s.so.1 must be installed for pthread_cancel to work\n");
+    __libc_fatal (LIBGCC_S_SO " must be installed for pthread_cancel to work\n");
 
   PTR_MANGLE (resume);
   libgcc_s_resume = resume;

Modified: fsf/trunk/libc/nptl/sysdeps/pthread/unwind-resume.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/pthread/unwind-resume.c (original)
+++ fsf/trunk/libc/nptl/sysdeps/pthread/unwind-resume.c Wed Nov  4 00:04:03 2009
@@ -20,6 +20,7 @@
 #include <dlfcn.h>
 #include <stdio.h>
 #include <unwind.h>
+#include <libgcc_s.h>
 
 static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
 static _Unwind_Reason_Code (*libgcc_s_personality)
@@ -32,12 +33,12 @@
   void *resume, *personality;
   void *handle;
 
-  handle = __libc_dlopen ("libgcc_s.so.1");
+  handle = __libc_dlopen (LIBGCC_S_SO);
 
   if (handle == NULL
       || (resume = __libc_dlsym (handle, "_Unwind_Resume")) == NULL
       || (personality = __libc_dlsym (handle, "__gcc_personality_v0")) == NULL)
-    __libc_fatal ("libgcc_s.so.1 must be installed for pthread_cancel to work\n");
+    __libc_fatal (LIBGCC_S_SO " must be installed for pthread_cancel to work\n");
 
   libgcc_s_resume = resume;
   libgcc_s_personality = personality;

Modified: fsf/trunk/libc/sysdeps/generic/framestate.c
==============================================================================
--- fsf/trunk/libc/sysdeps/generic/framestate.c (original)
+++ fsf/trunk/libc/sysdeps/generic/framestate.c Wed Nov  4 00:04:03 2009
@@ -24,6 +24,7 @@
 #define __frame_state_for fallback_frame_state_for
 #include <unwind-dw2.c>
 #undef __frame_state_for
+#include <libgcc_s.h>
 
 typedef struct frame_state * (*framesf)(void *pc, struct frame_state *);
 struct frame_state *__frame_state_for (void *pc,
@@ -36,7 +37,7 @@
 
   if (frame_state_for == NULL)
     {
-      void *handle = __libc_dlopen ("libgcc_s.so.1");
+      void *handle = __libc_dlopen (LIBGCC_S_SO);
 
       if (handle == NULL
 	  || (frame_state_for

Added: fsf/trunk/libc/sysdeps/generic/libgcc_s.h
==============================================================================
--- fsf/trunk/libc/sysdeps/generic/libgcc_s.h (added)
+++ fsf/trunk/libc/sysdeps/generic/libgcc_s.h Wed Nov  4 00:04:03 2009
@@ -1,0 +1,2 @@
+/* Name of libgcc_s library provided by gcc.  */
+#define LIBGCC_S_SO "libgcc_s.so.1"