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.22-693-ga314083
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 20 Jan 2016 23:06:50 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.22-693-ga314083
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 a3140836c82679f85b780e936ae0c0179997952e (commit)
from b274130206cb9fce1d7b026386a910428cbdb45c (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=a3140836c82679f85b780e936ae0c0179997952e
commit a3140836c82679f85b780e936ae0c0179997952e
Author: Roland McGrath <roland@hack.frob.com>
Date: Wed Jan 20 13:57:14 2016 -0800
NaCl: Fix unused variable errors in lowlevellock-futex.h macros.
diff --git a/ChangeLog b/ChangeLog
index ac8eb40..f1c6ac5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-20 Roland McGrath <roland@hack.frob.com>
+
+ * sysdeps/nacl/lowlevellock-futex.h
+ (lll_futex_wait, lll_futex_timed_wait, lll_futex_wake):
+ Always evaluate PRIVATE argument.
+
2016-01-20 Paul Pluzhnikov <ppluzhnikov@google.com>
[BZ #19490]
diff --git a/sysdeps/nacl/lowlevellock-futex.h b/sysdeps/nacl/lowlevellock-futex.h
index 5f7d459..5382f68 100644
--- a/sysdeps/nacl/lowlevellock-futex.h
+++ b/sysdeps/nacl/lowlevellock-futex.h
@@ -35,7 +35,8 @@
/* Wait while *FUTEXP == VAL for an lll_futex_wake call on FUTEXP. */
#define lll_futex_wait(futexp, val, private) \
- (- __nacl_irt_futex.futex_wait_abs ((volatile int *) (futexp), val, NULL))
+ ((void) (private), \
+ - __nacl_irt_futex.futex_wait_abs ((volatile int *) (futexp), val, NULL))
/* Wait until a lll_futex_wake call on FUTEXP, or TIMEOUT elapses. */
#define lll_futex_timed_wait(futexp, val, timeout, private) \
@@ -60,13 +61,15 @@
if (_err == 0) \
_err = __nacl_irt_futex.futex_wait_abs \
((volatile int *) (futexp), val, _to); \
- -_err; \
+ (void) (private); \
+ -_err; \
})
/* Wake up up to NR waiters on FUTEXP. */
#define lll_futex_wake(futexp, nr, private) \
({ \
int _woken; \
+ (void) (private); \
- __nacl_irt_futex.futex_wake ((volatile int *) (futexp), nr, &_woken); \
})
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
sysdeps/nacl/lowlevellock-futex.h | 7 +++++--
2 files changed, 11 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources