[commits] r8849 - in /branches/eglibc-2_10: libc/ libc/nptl/sysdeps/pthread/ libc/sysdeps/generic/ ports/ ports/sysdeps/hppa/ ports/sy...

[maxim@xxxxxxxxxx]

Author: maxim
Date: Thu Aug 20 12:29:03 2009
New Revision: 8849

Log:
	Backport from the trunk:

	2009-08-20  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
	    Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
	Allow ports to define the version of the libgcc_s.so library.
	* shlib-versions: Add line for libgcc_s, set version to 1.
	* sysdeps/generic/framestate.c: Include gnu/lib-names.h,
	use LIBGCC_S_SO instead of hardcoded string.
	* nptl/sysdeps/pthread/unwind-resume.c: Same.
	* nptl/sysdeps/pthread/unwind-forceunwind.c: Same.
	ports/
	2009-08-20  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
	    Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
	* sysdeps/m68k/shlib-versions: New file, set libgcc_s' version to 2.
	* sysdeps/hppa/shlib-versions: Add line for libgcc_s, set version to 4.

Added:
    branches/eglibc-2_10/ports/sysdeps/m68k/shlib-versions
Modified:
    branches/eglibc-2_10/libc/ChangeLog.eglibc
    branches/eglibc-2_10/libc/nptl/sysdeps/pthread/unwind-forcedunwind.c
    branches/eglibc-2_10/libc/nptl/sysdeps/pthread/unwind-resume.c
    branches/eglibc-2_10/libc/shlib-versions
    branches/eglibc-2_10/libc/sysdeps/generic/framestate.c
    branches/eglibc-2_10/ports/ChangeLog.eglibc
    branches/eglibc-2_10/ports/sysdeps/hppa/shlib-versions

Modified: branches/eglibc-2_10/libc/ChangeLog.eglibc
==============================================================================
--- branches/eglibc-2_10/libc/ChangeLog.eglibc (original)
+++ branches/eglibc-2_10/libc/ChangeLog.eglibc Thu Aug 20 12:29:03 2009
@@ -1,3 +1,16 @@
+2009-08-20  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
+
+	Backport from the trunk:
+
+	2009-08-20  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
+	    Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
+	Allow ports to define the version of the libgcc_s.so library.
+	* shlib-versions: Add line for libgcc_s, set version to 1.
+	* sysdeps/generic/framestate.c: Include gnu/lib-names.h,
+	use LIBGCC_S_SO instead of hardcoded string.
+	* nptl/sysdeps/pthread/unwind-resume.c: Same.
+	* nptl/sysdeps/pthread/unwind-forceunwind.c: Same.
+
 2009-07-27  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
 
 	Revert previous commit to the wrong branch:

Modified: branches/eglibc-2_10/libc/nptl/sysdeps/pthread/unwind-forcedunwind.c
==============================================================================
--- branches/eglibc-2_10/libc/nptl/sysdeps/pthread/unwind-forcedunwind.c (original)
+++ branches/eglibc-2_10/libc/nptl/sysdeps/pthread/unwind-forcedunwind.c Thu Aug 20 12:29:03 2009
@@ -22,6 +22,7 @@
 #include <unwind.h>
 #include <pthreadP.h>
 #include <sysdep.h>
+#include <gnu/lib-names.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: branches/eglibc-2_10/libc/nptl/sysdeps/pthread/unwind-resume.c
==============================================================================
--- branches/eglibc-2_10/libc/nptl/sysdeps/pthread/unwind-resume.c (original)
+++ branches/eglibc-2_10/libc/nptl/sysdeps/pthread/unwind-resume.c Thu Aug 20 12:29:03 2009
@@ -20,6 +20,7 @@
 #include <dlfcn.h>
 #include <stdio.h>
 #include <unwind.h>
+#include <gnu/lib-names.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: branches/eglibc-2_10/libc/shlib-versions
==============================================================================
--- branches/eglibc-2_10/libc/shlib-versions (original)
+++ branches/eglibc-2_10/libc/shlib-versions Thu Aug 20 12:29:03 2009
@@ -134,3 +134,8 @@
 
 # The asynchronous name lookup library.
 .*-.*-.*		libanl=1
+
+# The GCC support library.
+# We don't really provide this one as the part of GLIBC,
+# but we declare it here to produce LIBGCC_S_SO macro in gnu/lib-names.h.
+.*-.*-.*                libgcc_s=1

Modified: branches/eglibc-2_10/libc/sysdeps/generic/framestate.c
==============================================================================
--- branches/eglibc-2_10/libc/sysdeps/generic/framestate.c (original)
+++ branches/eglibc-2_10/libc/sysdeps/generic/framestate.c Thu Aug 20 12:29:03 2009
@@ -20,6 +20,7 @@
 
 #include <dlfcn.h>
 #include <stdlib.h>
+#include <gnu/lib-names.h>
 #define STATIC static
 #define __frame_state_for fallback_frame_state_for
 #include <unwind-dw2.c>
@@ -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

Modified: branches/eglibc-2_10/ports/ChangeLog.eglibc
==============================================================================
--- branches/eglibc-2_10/ports/ChangeLog.eglibc (original)
+++ branches/eglibc-2_10/ports/ChangeLog.eglibc Thu Aug 20 12:29:03 2009
@@ -1,3 +1,12 @@
+2009-08-20  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
+	
+	Backport from the trunk:
+
+	2009-08-20  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
+	    Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
+	* sysdeps/m68k/shlib-versions: New file, set libgcc_s' version to 2.
+	* sysdeps/hppa/shlib-versions: Add line for libgcc_s, set version to 4.
+
 2009-05-16  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	Backport:

Modified: branches/eglibc-2_10/ports/sysdeps/hppa/shlib-versions
==============================================================================
--- branches/eglibc-2_10/ports/sysdeps/hppa/shlib-versions (original)
+++ branches/eglibc-2_10/ports/sysdeps/hppa/shlib-versions Thu Aug 20 12:29:03 2009
@@ -5,3 +5,5 @@
 hppa.*-.*-.*		ld=ld.so.1		GLIBC_2.2
 
 hppa-.*-.*		libBrokenLocale=1	GLIBC_2.2
+
+hppa-.*-.*              libgcc_s=4

Added: branches/eglibc-2_10/ports/sysdeps/m68k/shlib-versions
==============================================================================
--- branches/eglibc-2_10/ports/sysdeps/m68k/shlib-versions (added)
+++ branches/eglibc-2_10/ports/sysdeps/m68k/shlib-versions Thu Aug 20 12:29:03 2009
@@ -1,0 +1,1 @@
+m68k-.*-.*              libgcc_s=2