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.20-557-ge0da28a
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 24 Jan 2015 00:21:49 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.20-557-ge0da28a
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 e0da28a1b2ff9112f4aee4cebd4b22fce1ae62ac (commit)
from 22971c35e2de34ec3e1b02e9bceebcba2ead7bfe (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e0da28a1b2ff9112f4aee4cebd4b22fce1ae62ac
commit e0da28a1b2ff9112f4aee4cebd4b22fce1ae62ac
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Jan 23 16:21:07 2015 -0800
Also use uint64_t in __new_sem_wait_fast
diff --git a/ChangeLog b/ChangeLog
index a59266f..306341c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
with uint64_t.
* nptl/sem_waitcommon.c (__sem_wait_cleanup): Replace 1UL with
(uint64_t) 1.
+ (__new_sem_wait_fast): Replace unsigned long with uint64_t.
(__new_sem_wait_slow): Replace unsigned long int with uint64_t.
Replace 1UL with (uint64_t) 1.
* sysdeps/nptl/internaltypes.h (new_sem): Replace unsigned long
diff --git a/nptl/sem_waitcommon.c b/nptl/sem_waitcommon.c
index c60daa3..311e511 100644
--- a/nptl/sem_waitcommon.c
+++ b/nptl/sem_waitcommon.c
@@ -228,7 +228,7 @@ __new_sem_wait_fast (struct new_sem *sem, int definitive_result)
and the failure path of the CAS. If the weak CAS fails and we need a
definitive result, retry. */
#if __HAVE_64B_ATOMICS
- unsigned long d = atomic_load_relaxed (&sem->data);
+ uint64_t d = atomic_load_relaxed (&sem->data);
do
{
if ((d & SEM_VALUE_MASK) == 0)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
nptl/sem_waitcommon.c | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
hooks/post-receive
--
GNU C Library master sources