summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-06-04 19:48:29 +0000
committerUlrich Drepper <drepper@redhat.com>2003-06-04 19:48:29 +0000
commit29d9e2fd2c19b758998a65ade92180d03fed4cae (patch)
tree7cc2ef8d0d13965c29732d0996e1817c6ab5f07a
parent1fb2614ae5c21a199893a1919846a7057bdb889f (diff)
downloadglibc-29d9e2fd2c19b758998a65ade92180d03fed4cae.tar.gz
glibc-29d9e2fd2c19b758998a65ade92180d03fed4cae.tar.xz
glibc-29d9e2fd2c19b758998a65ade92180d03fed4cae.zip
Update.
2003-06-04  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
	(__pthread_cond_signal): Add some code to eventually handle
	cond_lock!=0.
-rw-r--r--nptl/ChangeLog6
-rw-r--r--nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S4
2 files changed, 10 insertions, 0 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 61e87c31f0..5b88e6da34 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-04  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
+	(__pthread_cond_signal): Add some code to eventually handle
+	cond_lock!=0.
+
 2003-06-01  Ulrich Drepper  <drepper@redhat.com>
 
 	* Makefile (tests): Add tst-exec4.
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 ed25c554d2..4b4fc051cb 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
@@ -92,7 +92,11 @@ __pthread_cond_signal:
 
 	/* Unlock.  */
 4:	LOCK
+#if cond_lock == 0
 	subl	$1, (%edi)
+#else
+	subl	$1, cond_lock(%edi)
+#endif
 	jne	5f
 
 6:	xorl	%eax, %eax