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.15-330-g2edd9a7
- From: tschwinge at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 8 Mar 2012 10:23:35 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.15-330-g2edd9a7
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 2edd9a79e5967e01f9afc3ae1207159a2c53c73f (commit)
from c564a81246d0064eb12bc34cac8996709a0ecbfc (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=2edd9a79e5967e01f9afc3ae1207159a2c53c73f
commit 2edd9a79e5967e01f9afc3ae1207159a2c53c73f
Author: Thomas Schwinge <thomas@codesourcery.com>
Date: Thu Mar 8 11:22:41 2012 +0100
Work around kernel rejecting valid absolute timestamps.
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index cd70329..ddd0ee2 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,8 @@
2012-03-08 Thomas Schwinge <thomas@codesourcery.com>
+ * sysdeps/unix/sysv/linux/sh/lowlevellock.S (__lll_timedlock_wait):
+ Check for timestamp before the Epoch.
+
* sysdeps/unix/sysv/linux/sh/sem_timedwait.S (sem_timedwait): Fix
updating nwaiters.
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
index 9327860..fe4e3b6 100644
--- a/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
@@ -1,5 +1,4 @@
-/* Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010
- Free Software Foundation, Inc.
+/* Copyright (C) 2003-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -243,6 +242,12 @@ __lll_timedlock_wait:
bt .Lreltmo
# endif
+ /* if (timeout->tv_sec < 0) return ETIMEDOUT; */
+ mov.l @r6, r1
+ cmp/pz r1
+ bf/s 5f
+ mov #ETIMEDOUT, r0
+
mov r4, r2
mov r5, r4
mov r7, r5
@@ -278,6 +283,7 @@ __lll_timedlock_wait:
neg r0, r3
3:
mov r3, r0
+5:
rts
mov.l @r15+, r12
-----------------------------------------------------------------------
Summary of changes:
nptl/ChangeLog | 3 +++
nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S | 10 ++++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources