From patchwork Wed Jan 20 23:06:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland McGrath X-Patchwork-Id: 10492 Received: (qmail 81322 invoked by alias); 20 Jan 2016 23:06:55 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 81309 invoked by uid 89); 20 Jan 2016 23:06:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.9 required=5.0 tests=BAYES_00, KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2 spammy=PRIVATE X-HELO: topped-with-meat.com MIME-Version: 1.0 From: Roland McGrath To: "GNU C. Library" Subject: [COMMITTED PATCH] NaCl: Fix unused variable errors in lowlevellock-futex.h macros. Message-Id: <20160120230652.B583A2C3B00@topped-with-meat.com> Date: Wed, 20 Jan 2016 15:06:52 -0800 (PST) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=RZ8DVTdv c=1 sm=1 tr=0 a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=hOe2yjtxAAAA:8 a=kj9zAlcOel0A:10 a=l2UyJ771_72wzvNUkvMA:9 a=CjuIK1q_8ugA:10 This unbreaks the trunk build on arm-nacl. Thanks, Roland 2016-01-20 Roland McGrath * sysdeps/nacl/lowlevellock-futex.h (lll_futex_wait, lll_futex_timed_wait, lll_futex_wake): Always evaluate PRIVATE argument. 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); \ })