From 022f6b89208acd2a67eb28a94d6d240e85088398 Mon Sep 17 00:00:00 2001 From: Dinakar Guniguntala Date: Thu, 19 Aug 2010 00:46:19 -0700 Subject: Fix x86 pthread_cond_signal() FUTEX_WAKE_OP fallback --- nptl/ChangeLog | 6 ++++++ nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'nptl') diff --git a/nptl/ChangeLog b/nptl/ChangeLog index a0fe7b0..d4a1deb 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,9 @@ +2010-08-10 Dinakar Guniguntala + Stefan Hajnoczi + + * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S: If + FUTEX_WAKE_OP fails make sure to call FUTEX_WAKE instead. + 2010-08-12 H.J. Lu * sysdeps/unix/sysv/linux/i386/Makefile: New file. 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 9fc2cbf..05cda25 100644 --- 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 , 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 */ -- cgit v1.1