Fix x86 pthread_cond_signal() FUTEX_WAKE_OP fallback

(cherry picked from commit 022f6b89208acd2a67eb28a94d6d240e85088398)

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 66ff9196a080364877675032235a7dbcf7d10563..cf038e3416f484d005a8f0238dd9c9e56b23a1d3 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-10  Dinakar Guniguntala  <dino@in.ibm.com>
+           Stefan Hajnoczi  <stefanha@linux.vnet.ibm.com>
+
+       * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S: If
+       FUTEX_WAKE_OP fails make sure to call FUTEX_WAKE instead.
+
 2010-07-03  Ulrich Drepper  <drepper@redhat.com>
 
        * tst-abstime.c (do_test): Some more cleanups

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
index 9fc2cbfeaf1c5ae41f46df559804d2da956cbdbc..05cda25d3e3fc2649c0bf5cdf655de2635e002da 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002,2003,2004,2005,2007,2009 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2005,2007,2009,2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -163,7 +163,6 @@ __pthread_cond_signal:
 #endif
        orl     $FUTEX_WAKE, %ecx
 
-       xorl    $(FUTEX_WAKE ^ FUTEX_WAKE_OP), %ecx
        movl    $SYS_futex, %eax
        /* %edx should be 1 already from $FUTEX_WAKE_OP syscall.
        movl    $1, %edx  */