about summary refs log tree commit diff
path: root/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
diff options
context:
space:
mode:
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S')
-rw-r--r--nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S19
1 files changed, 3 insertions, 16 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
index 90d2d3ba90..81a4623a9c 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
@@ -44,9 +44,6 @@ __pthread_cond_broadcast:
 	pushl	%ebx
 
 	movl	12(%esp), %ebx
-#if cond_lock != 0
-	addl	$cond_lock, %ebx
-#endif
 
 	/* Get internal lock.  */
 	movl	$1, %eax
@@ -72,22 +69,16 @@ __pthread_cond_broadcast:
 	movl	%eax, wakeup_seq+4(%ebx)
 
 	/* Wake up all threads.  */
-	addl	$wakeup_seq-cond_lock, %ebx
+	addl	$wakeup_seq, %ebx
 	movl	$FUTEX_WAKE, %ecx
 	xorl	%esi, %esi
 	movl	$SYS_futex, %eax
 	movl	$0x7fffffff, %edx
 	ENTER_KERNEL
 
-	subl	$wakeup_seq-cond_lock, %ebx
-
 	/* Unlock.  */
 4:	LOCK
-#if cond_lock == 0
-	decl	(%ebx)
-#else
-	decl	cond_lock(%ebx)
-#endif
+	decl	cond_lock-wakeup_seq(%ebx)
 	jne	5f
 
 6:	xorl	%eax, %eax
@@ -107,11 +98,7 @@ __pthread_cond_broadcast:
 
 	/* Unlock in loop requires waekup.  */
 5:
-#if cond_lock == 0
-	movl	%ebx, %eax
-#else
-	leal	cond_lock(%ebx), %eax
-#endif
+	leal	cond_lock-wakeup_seq(%ebx), %eax
 	call	__lll_mutex_unlock_wake
 	jmp	6b
 	.size	__pthread_cond_broadcast, .-__pthread_cond_broadcast