Fix pthread_cond_timedwait error handling on old kernels.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 2f0b8d8b7cf10e2414d8478361d426e548c5a7f1..68fe3779c38230f0dc6c1328f76448d9b78c4533 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-23  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S: Fix error
+       path when not using absolute timeout futex.
+
 2009-07-20  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S: Minor

diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
index e12790cb963129be8111aca8825be080a0241d7b..7486825d5f2accbeff541acd831f98477825255c 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
@@ -551,12 +551,12 @@ __pthread_cond_timedwait:
        jne     53b
 
        cmpq    24(%rsp), %r9
-       jbe     45b
+       jbe     15f
 
        cmpq    %rax, %r9
        ja      39b
 
-       cmpq    $-ETIMEDOUT, %r14
+15:    cmpq    $-ETIMEDOUT, %r14
        jne     8b
 
        jmp     99b