summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-05-30 04:22:24 +0000
committerUlrich Drepper <drepper@redhat.com>2007-05-30 04:22:24 +0000
commitfc3f0ccb9884844acc1b15673dc17a190e0a2262 (patch)
tree63c81cf2935567a9080d1389dce6d24b603fa429
parent0154658d3db3ac2880c44bcc85c6fe47f4bdbb7c (diff)
downloadglibc-fc3f0ccb9884844acc1b15673dc17a190e0a2262.tar.gz
glibc-fc3f0ccb9884844acc1b15673dc17a190e0a2262.tar.xz
glibc-fc3f0ccb9884844acc1b15673dc17a190e0a2262.zip
* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
	(__lll_mutex_unlock_wake): Add back label '1' which went AWOL quite
	some time ago.
-rw-r--r--nptl/ChangeLog4
-rw-r--r--nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S3
2 files changed, 6 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index b757f48df5..285c3793f8 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,9 @@
 2007-05-29  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
+	(__lll_mutex_unlock_wake): Add back label '1' which went AWOL quite
+	some time ago.
+
 	* sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S: Checking
 	whether there are more than one thread makes no sense here since
 	we only call the slow path if the locks are taken.
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
index de70b1852c..b92fa5c895 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
@@ -253,7 +253,8 @@ __lll_mutex_unlock_wake:
 	cfi_offset(%rsi, -16)
 	cfi_offset(%rdx, -24)
 
-	movl	$0, (%rdi)
+	/* NB: the label '1' is needed by lll_unlock_wake_cb.  */
+1:	movl	$0, (%rdi)
 	LOAD_FUTEX_WAKE (%esi)
 	movl	$1, %edx	/* Wake one thread.  */
 	movl	$SYS_futex, %eax