r2408 - in glibc-package/trunk/debian: . patches patches/hppa
Author: aurel32
Date: 2007-07-10 07:17:12 +0000 (Tue, 10 Jul 2007)
New Revision: 2408
Added:
glibc-package/trunk/debian/patches/hppa/submitted-multiple-threads.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* hppa/submitted-multiple-threads.diff: new patch to fix an FTBFS on
hppa. Closes: bug#428509, bug#429487.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-07-10 03:46:33 UTC (rev 2407)
+++ glibc-package/trunk/debian/changelog 2007-07-10 07:17:12 UTC (rev 2408)
@@ -9,8 +9,10 @@
[ Aurelien Jarno ]
* Add any/cvs-ld-integer-overflow.diff: fix an integer
overflow in ld.so. Closes: bug#431858.
+ * hppa/submitted-multiple-threads.diff: new patch to fix an FTBFS on
+ hppa. Closes: bug#428509, bug#429487.
- -- Aurelien Jarno <aurel32@debian.org> Tue, 10 Jul 2007 05:44:55 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 10 Jul 2007 09:15:12 +0200
glibc (2.6-1) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/hppa/submitted-multiple-threads.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa/submitted-multiple-threads.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hppa/submitted-multiple-threads.diff 2007-07-10 07:17:12 UTC (rev 2408)
@@ -0,0 +1,23 @@
+2007-07-10 Aurelien Jarno <aurelien@aurel32.net>
+
+ * sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h:
+ (__local_multiple_threads): Declare as hidden only in libc and
+ in libpthread.
+
+Index: ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h
+===================================================================
+--- ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h.orig
++++ ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h
+@@ -206,7 +206,11 @@
+ # endif
+
+ # ifndef __ASSEMBLER__
+- extern int __local_multiple_threads attribute_hidden;
++# if !defined NOT_IN_libc || defined IS_IN_libpthread
++extern int __local_multiple_threads attribute_hidden;
++# else
++extern int __local_multiple_threads;
++# endif
+ # define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
+ # else
+ /* This ALT version requires newer kernel support */
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2007-07-10 03:46:33 UTC (rev 2407)
+++ glibc-package/trunk/debian/patches/series 2007-07-10 07:17:12 UTC (rev 2408)
@@ -47,6 +47,7 @@
hppa/submitted-atomic_h.diff -p0
hppa/submitted-lt.diff -p0
+hppa/submitted-multiple-threads.diff -p0
hppa/submitted-nptl-carlos.diff -p0
hppa/submitted-pie.diff
hppa/submitted-ustat.diff -p0
Reply to: