r2477 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2007-07-29 14:48:10 +0000 (Sun, 29 Jul 2007)
New Revision: 2477
Added:
glibc-package/trunk/debian/patches/any/submitted-libgcc_s.so.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* any/submitted-libgcc_s.so.diff: patch from Carlos O'Donell to allow
differents libgcc_s.so SONAME on architecture basis.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-07-29 14:41:26 UTC (rev 2476)
+++ glibc-package/trunk/debian/changelog 2007-07-29 14:48:10 UTC (rev 2477)
@@ -24,8 +24,10 @@
* kfreebsd/local-sysdeps.diff: update to revision 1989 (from glibc-bsd).
* any/submitted-longdouble.diff: patch from Carlos O'Donell to fix long
double tests.
+ * any/submitted-libgcc_s.so.diff: patch from Carlos O'Donell to allow
+ differents libgcc_s.so SONAME on architecture basis.
- -- Aurelien Jarno <aurel32@debian.org> Sun, 29 Jul 2007 16:40:09 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 29 Jul 2007 16:46:44 +0200
glibc (2.6-4) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/any/submitted-libgcc_s.so.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-libgcc_s.so.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/submitted-libgcc_s.so.diff 2007-07-29 14:48:10 UTC (rev 2477)
@@ -0,0 +1,27 @@
+Index: sysdeps/generic/framestate.c
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/generic/framestate.c,v
+retrieving revision 1.4
+diff -u -p -r1.4 framestate.c
+--- sysdeps/generic/framestate.c 21 Feb 2004 09:07:05 -0000 1.4
++++ sysdeps/generic/framestate.c 28 Jul 2007 21:19:14 -0000
+@@ -25,6 +25,10 @@
+ #include <unwind-dw2.c>
+ #undef __frame_state_for
+
++#ifndef LIBGCC_S_SO
++#define LIBGCC_S_SO "libgcc_s.so.1"
++#endif
++
+ typedef struct frame_state * (*framesf)(void *pc, struct frame_state *);
+ struct frame_state *__frame_state_for (void *pc,
+ struct frame_state *frame_state);
+@@ -36,7 +40,7 @@ __frame_state_for (void *pc, struct fram
+
+ 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: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2007-07-29 14:41:26 UTC (rev 2476)
+++ glibc-package/trunk/debian/patches/series 2007-07-29 14:48:10 UTC (rev 2477)
@@ -149,6 +149,7 @@
any/submitted-getcwd-sys_param_h.diff -p0
any/submitted-clock-settime.diff -p0
any/submitted-date-and-unknown-tz.diff -p0
+any/submitted-libgcc_s.so.diff -p0
any/submitted-longdouble.diff -p0
any/submitted-strfry.diff -p0
any/submitted-strtok.diff -p0
Reply to: