This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.10-199-gf1adf1f
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 23 Jul 2009 23:39:25 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.10-199-gf1adf1f
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via f1adf1f490b33a61eccad1682fbd9b1b66d404bd (commit)
from b2509a1e380bc92ee6ae6437103d349e1f517773 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f1adf1f490b33a61eccad1682fbd9b1b66d404bd
commit f1adf1f490b33a61eccad1682fbd9b1b66d404bd
Author: Ulrich Drepper <drepper@redhat.com>
Date: Thu Jul 23 16:39:06 2009 -0700
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
-----------------------------------------------------------------------
Summary of changes:
nptl/ChangeLog | 5 +++++
.../sysv/linux/x86_64/pthread_cond_timedwait.S | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources