From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 23 Jul 2009 23:39:06 +0000 (-0700)
Subject: Fix pthread_cond_timedwait error handling on old kernels.
X-Git-Tag: glibc-2.11~208
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1adf1f490b33a61eccad1682fbd9b1b66d404bd;p=platform%2Fupstream%2Fglibc.git

Fix pthread_cond_timedwait error handling on old kernels.
---

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 2f0b8d8..68fe377 100644
--- 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 e12790c..7486825 100644
--- 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