r4190 - in glibc-package/branches/eglibc-2.11/debian: . patches patches/hppa
Author: aurel32
Date: 2010-02-11 13:58:15 +0000 (Thu, 11 Feb 2010)
New Revision: 4190
Added:
glibc-package/branches/eglibc-2.11/debian/patches/hppa/local-lowlevellock.diff
Modified:
glibc-package/branches/eglibc-2.11/debian/changelog
glibc-package/branches/eglibc-2.11/debian/patches/series
Log:
* Add debian/patches/mips/local-lowlevellock.diff to fix the testsuite
on hppa.
Modified: glibc-package/branches/eglibc-2.11/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/changelog 2010-02-11 12:07:53 UTC (rev 4189)
+++ glibc-package/branches/eglibc-2.11/debian/changelog 2010-02-11 13:58:15 UTC (rev 4190)
@@ -62,6 +62,8 @@
* Reenable the testsuite on mips/mipsel build daemons.
* Add debian/patches/arm/local-atomic.diff to fix the testsuite on arm.
* Add debian/patches/hppa/local-longjmp-chk.diff to fix FTBFS on hppa.
+ * Add debian/patches/mips/local-lowlevellock.diff to fix the testsuite
+ on hppa.
[ Samuel Thibault ]
* debian/patches/hurd-i386/submitted-rtld_lock_recursive.diff: New patch to
@@ -78,7 +80,7 @@
* Add kfreebsd/local-dosavesse.diff, which does not work,
so rather use also added kfreebsd/local-nosavesse.diff
- -- Aurelien Jarno <aurel32@debian.org> Tue, 09 Feb 2010 23:24:46 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 11 Feb 2010 14:57:51 +0100
eglibc (2.10.2-7) UNRELEASED; urgency=low
Added: glibc-package/branches/eglibc-2.11/debian/patches/hppa/local-lowlevellock.diff
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/hppa/local-lowlevellock.diff (rev 0)
+++ glibc-package/branches/eglibc-2.11/debian/patches/hppa/local-lowlevellock.diff 2010-02-11 13:58:15 UTC (rev 4190)
@@ -0,0 +1,29 @@
+2010-02-11 Aurelien Jarno <aurelien@aurel32.net>
+
+ * sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h: remove
+ useless <sysdep.h> include. Move <tls.h> include to...
+ * sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.c: here.
+
+--- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.c
++++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.c
+@@ -22,6 +22,7 @@
+ #include <sysdep.h>
+ #include <lowlevellock.h>
+ #include <sys/time.h>
++#include <tls.h> /* Need THREAD_*, and header.*. */
+
+ void
+ __lll_lock_wait (lll_lock_t *futex, int private)
+--- a/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
++++ b/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
+@@ -22,10 +22,8 @@
+ #include <time.h>
+ #include <sys/param.h>
+ #include <bits/pthreadtypes.h>
+-#include <sysdep.h>
+ #include <atomic.h>
+ #include <kernel-features.h> /* Need __ASSUME_PRIVATE_FUTEX. */
+-#include <tls.h> /* Need THREAD_*, and header.*. */
+
+ /* HPPA only has one atomic read and modify memory operation,
+ load and clear, so hppa uses a kernel helper routine to implement
Modified: glibc-package/branches/eglibc-2.11/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/series 2010-02-11 12:07:53 UTC (rev 4189)
+++ glibc-package/branches/eglibc-2.11/debian/patches/series 2010-02-11 13:58:15 UTC (rev 4190)
@@ -79,6 +79,7 @@
hppa/local-_dl_fptr_init.diff
hppa/local-ELF_MACHINE_BEFORE_RTLD_RELOC.diff
hppa/local-longjmp-chk.diff
+hppa/local-lowlevellock.diff
hurd-i386/local-dl-dynamic-weak.diff
hurd-i386/local-enable-ldconfig.diff
Reply to: