Return result of lock re-get if it fails.

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
index f11a44ec431ecb2efd04eb480ac753382e8a5805..811741b06d707633c883d5f6c88f895f50dab937 100644 (file)
--- 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.  */