Author: aurel32
Date: 2009-06-14 14:13:00 +0000 (Sun, 14 Jun 2009)
New Revision: 3557

Removed:
   glibc-package/trunk/debian/patches/i386/cvs-futex-syscall.diff
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/series
Log:
Revert r3554, it is need on 2.10 only


Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog        2009-06-14 13:57:19 UTC (rev 
3556)
+++ glibc-package/trunk/debian/changelog        2009-06-14 14:13:00 UTC (rev 
3557)
@@ -3,8 +3,6 @@
   * 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.
   * Update Italian debconf translation, by Luca Monducci.  Closes: #531431.
 
  -- Aurelien Jarno <[email protected]>  Sat, 13 Jun 2009 22:25:41 +0200

Deleted: glibc-package/trunk/debian/patches/i386/cvs-futex-syscall.diff
===================================================================
--- glibc-package/trunk/debian/patches/i386/cvs-futex-syscall.diff      
2009-06-14 13:57:19 UTC (rev 3556)
+++ glibc-package/trunk/debian/patches/i386/cvs-futex-syscall.diff      
2009-06-14 14:13:00 UTC (rev 3557)
@@ -1,21 +0,0 @@
-2009-06-11  Ulrich Drepper  <[email protected]>
-
-       [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 <[email protected]>.
-
-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-14 13:57:19 UTC (rev 
3556)
+++ glibc-package/trunk/debian/patches/series   2009-06-14 14:13:00 UTC (rev 
3557)
@@ -110,7 +110,6 @@
 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


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to