summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-01-23 16:21:07 -0800
committerH.J. Lu <hjl.tools@gmail.com>2015-01-23 16:21:07 -0800
commite0da28a1b2ff9112f4aee4cebd4b22fce1ae62ac (patch)
tree55508c6d2d2e7930a1037df61f63d3cfe72929b5
parent22971c35e2de34ec3e1b02e9bceebcba2ead7bfe (diff)
downloadglibc-e0da28a1b2ff9112f4aee4cebd4b22fce1ae62ac.tar.gz
Also use uint64_t in __new_sem_wait_fast
-rw-r--r--ChangeLog1
-rw-r--r--nptl/sem_waitcommon.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a59266f771..306341c65e 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 c60daa3865..311e511195 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)