Return result of lock re-get if it fails.

2003-03-12 08:41:10 +00:00 · 2003-03-12 08:41:10 +00:00 · a3cd7da30f
parent d63609a7b6
commit a3cd7da30f
1 changed files with 3 additions and 2 deletions
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
@ -206,14 +206,15 @@ __pthread_cond_timedwait:
 	call	__pthread_mutex_lock_internal
 	addl	$36, %esp

-	movl	%esi, %eax
+	/* We return the result of the mutex_lock operation if it failed.  */
+	testl	%eax, %eax
+	cmovel	%esi, %eax

 18:	popl	%ebx
 	popl	%esi
 	popl	%edi
 	popl	%ebp

-	/* We return the result of the mutex_lock operation.  */
 	ret

 	/* Initial locking failed.  */