diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/nacl/lowlevellock-futex.h | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index ac8eb40ceb..f1c6ac5cd0 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 5f7d45950b..5382f685ff 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); \ }) |