r3554 - in glibc-package/trunk/debian: . patches patches/i386
Author: aurel32
Date: 2009-06-13 20:26:30 +0000 (Sat, 13 Jun 2009)
New Revision: 3554
Added:
glibc-package/trunk/debian/patches/i386/cvs-futex-syscall.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* i386/cvs-futex-syscall.diff: patch from upstream to fix futex syscall
parameter for x86 absolute timeout waits.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-06-13 20:19:04 UTC (rev 3553)
+++ glibc-package/trunk/debian/changelog 2009-06-13 20:26:30 UTC (rev 3554)
@@ -3,8 +3,10 @@
* kfreebsd/local-sysdeps.diff: update to revision 2597 (from glibc-bsd).
Update expected testsuite results accordingly.
* any/cvs-broken-dns.diff: backport more parts from upstream.
+ * i386/cvs-futex-syscall.diff: patch from upstream to fix futex syscall
+ parameter for x86 absolute timeout waits.
- -- Aurelien Jarno <aurel32@debian.org> Sat, 13 Jun 2009 21:33:04 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sat, 13 Jun 2009 22:25:41 +0200
eglibc (2.9-14) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/i386/cvs-futex-syscall.diff
===================================================================
--- glibc-package/trunk/debian/patches/i386/cvs-futex-syscall.diff (rev 0)
+++ glibc-package/trunk/debian/patches/i386/cvs-futex-syscall.diff 2009-06-13 20:26:30 UTC (rev 3554)
@@ -0,0 +1,21 @@
+2009-06-11 Ulrich Drepper <drepper@redhat.com>
+
+ [BZ #10262]
+ * sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
+ (LOAD_FUTEX_WAIT_ABS): Fix futex parameter in case private futexes
+ cannot be assumed.
+ Patch by Bryan Kadzban <bz-glibc@kdzbn.homelinux.net>.
+
+diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
+index 056b729..7578c7e 100644
+--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
+@@ -60,7 +60,7 @@
+ # define LOAD_FUTEX_WAIT_ABS(reg) \
+ xorl $FUTEX_PRIVATE_FLAG, reg ; \
+ andl %gs:PRIVATE_FUTEX, reg ; \
+- orl $FUTEX_WAIT | FUTEX_CLOCK_REALTIME, reg
++ orl $FUTEX_WAIT_BITSET | FUTEX_CLOCK_REALTIME, reg
+ # define LOAD_FUTEX_WAKE(reg) \
+ xorl $FUTEX_PRIVATE_FLAG, reg ; \
+ andl %gs:PRIVATE_FUTEX, reg ; \
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2009-06-13 20:19:04 UTC (rev 3553)
+++ glibc-package/trunk/debian/patches/series 2009-06-13 20:26:30 UTC (rev 3554)
@@ -110,6 +110,7 @@
i386/local-cmov.diff
i386/local-linuxthreads-gscope.diff
i386/submitted-i686-timing.diff
+i386/cvs-futex-syscall.diff
m68k/local-compat.diff
m68k/local-dwarf2-buildfix.diff
Reply to: