From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by dpdk.org (Postfix) with ESMTP id E96625593 for ; Tue, 5 Jul 2016 12:45:06 +0200 (CEST) Received: by mail-wm0-f54.google.com with SMTP id 187so26180241wmz.1 for ; Tue, 05 Jul 2016 03:45:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=d5if4dn3XRjVGiEaaqlDGSW48Dd/0b9b0BEPEncuBHk=; b=Moi8ttlIu2SOCVioPk8DrWGnDA0jf9BvsN06fUlrvUJDMH3KrX9LZ2VbK7PtBVlK/L RCBFS5kukfFhXg2IwDt9CZzj7lzLQPaLoFI5Si7KqdEkCezJPyp536D2LWiauRKMp1/y kLrPY0TjO5hte5d++uqwvw3F4s6kP9uIRcGRmoLf8R3sZRTuBTjJh7lvazhJDgf/lFEx BGbC/Kd43rPNvRx0C5ycuykPE8p4BTB43ioG8hrkSr7r5TXkEJHvy890geFKXlEecUSj xvnsjeQlcnQc08DwtOTWtO8HepKkhq8TuJphW7cx4dU2nrz91JJSXLTqt9mQDwnguI1l d9Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=d5if4dn3XRjVGiEaaqlDGSW48Dd/0b9b0BEPEncuBHk=; b=B9CugljeTsgws/0n51f2wEfvVeANF8IDN2MwdeUnXijG7wnXB5TM4GJ2BBEhNgoWkO TvQ6X+2A1viMKjEsA1WN5LGFs2uaRrBW4E5Jw5Y9Nv8r7EvOkiS85OSTNh4gEtVKB0Ex yFhgcRqkZJdzpIr8nvshq/plPi3Zk7CfbUUDN3T6MXZdxPsrWTXHUaELG1ykSVc+1gav jjiSy0hipguJoLvPhN2jHH8KACALQbB8gD/7jMsm63aiX0UH00MQDV/XnzxmIbdmo76/ uREE5yH/EhZTo4MRtV1ResV2TyV0/es3Nglcar/9dUxGLGt5NJzsU7Xogr3u17m2NO+N t8qA== X-Gm-Message-State: ALyK8tLTEfMB2nKn2CT2ulh7xgWd3oLFoahG9BoPW0cYi9AAvFyNZPdc5hFdHd/wKA+XwPLs X-Received: by 10.194.108.4 with SMTP id hg4mr16581610wjb.140.1467715506476; Tue, 05 Jul 2016 03:45:06 -0700 (PDT) Received: from 6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by smtp.gmail.com with ESMTPSA id wo9sm2953309wjb.8.2016.07.05.03.45.05 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 05 Jul 2016 03:45:05 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Date: Tue, 5 Jul 2016 12:44:47 +0200 Message-Id: <6d28b1ce41974cd29e3813e9b8bb0f23fbf5a534.1467715254.git.adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: <1459865290-10248-1-git-send-email-adrien.mazarguil@6wind.com> Subject: [dpdk-dev] [PATCH v2 01/11] lib: work around braced-groups within expressions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2016 10:45:07 -0000 Exported header files used by applications should allow the strictest compiler flags. Language extensions used in many places must be explicitly marked or removed to avoid warnings and compilation failures. This commit prevents the following errors: error: ISO C forbids braced-groups within expressions Signed-off-by: Adrien Mazarguil --- lib/librte_eal/common/include/arch/arm/rte_memcpy_32.h | 3 ++- lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h | 3 ++- lib/librte_eal/common/include/arch/x86/rte_memcpy.h | 4 ++-- lib/librte_eal/common/include/arch/x86/rte_vect.h | 6 ++++-- lib/librte_eal/common/include/rte_common.h | 6 ++++-- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/lib/librte_eal/common/include/arch/arm/rte_memcpy_32.h b/lib/librte_eal/common/include/arch/arm/rte_memcpy_32.h index da6c233..9a7b912 100644 --- a/lib/librte_eal/common/include/arch/arm/rte_memcpy_32.h +++ b/lib/librte_eal/common/include/arch/arm/rte_memcpy_32.h @@ -148,7 +148,8 @@ rte_mov256(uint8_t *dst, const uint8_t *src) } #define rte_memcpy(dst, src, n) \ - ({ (__builtin_constant_p(n)) ? \ + __extension__ ({ \ + __builtin_constant_p(n)) ? \ memcpy((dst), (src), (n)) : \ rte_memcpy_func((dst), (src), (n)); }) diff --git a/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h b/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h index acf7aac..a71fb13 100644 --- a/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h +++ b/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h @@ -95,7 +95,8 @@ rte_mov256(uint8_t *dst, const uint8_t *src) } #define rte_memcpy(dst, src, n) \ - ({ (__builtin_constant_p(n)) ? \ + __extension__ ({ \ + __builtin_constant_p(n)) ? \ memcpy((dst), (src), (n)) : \ rte_memcpy_func((dst), (src), (n)); }) diff --git a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h index 413035e..b3bfc23 100644 --- a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h +++ b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h @@ -594,7 +594,7 @@ rte_mov256(uint8_t *dst, const uint8_t *src) * - __m128i ~ must be pre-defined */ #define MOVEUNALIGNED_LEFT47_IMM(dst, src, len, offset) \ -({ \ +__extension__ ({ \ int tmp; \ while (len >= 128 + 16 - offset) { \ xmm0 = _mm_loadu_si128((const __m128i *)((const uint8_t *)src - offset + 0 * 16)); \ @@ -655,7 +655,7 @@ rte_mov256(uint8_t *dst, const uint8_t *src) * - __m128i ~ used in MOVEUNALIGNED_LEFT47_IMM must be pre-defined */ #define MOVEUNALIGNED_LEFT47(dst, src, len, offset) \ -({ \ +__extension__ ({ \ switch (offset) { \ case 0x01: MOVEUNALIGNED_LEFT47_IMM(dst, src, n, 0x01); break; \ case 0x02: MOVEUNALIGNED_LEFT47_IMM(dst, src, n, 0x02); break; \ diff --git a/lib/librte_eal/common/include/arch/x86/rte_vect.h b/lib/librte_eal/common/include/arch/x86/rte_vect.h index b698797..2836f2c 100644 --- a/lib/librte_eal/common/include/arch/x86/rte_vect.h +++ b/lib/librte_eal/common/include/arch/x86/rte_vect.h @@ -106,7 +106,8 @@ typedef union rte_ymm { #endif /* __AVX__ */ #ifdef RTE_ARCH_I686 -#define _mm_cvtsi128_si64(a) ({ \ +#define _mm_cvtsi128_si64(a) \ +__extension__ ({ \ rte_xmm_t m; \ m.x = (a); \ (m.u64[0]); \ @@ -117,7 +118,8 @@ typedef union rte_ymm { * Prior to version 12.1 icc doesn't support _mm_set_epi64x. */ #if (defined(__ICC) && __ICC < 1210) -#define _mm_set_epi64x(a, b) ({ \ +#define _mm_set_epi64x(a, b) \ +__extension__ ({ \ rte_xmm_t m; \ m.u64[0] = b; \ m.u64[1] = a; \ diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h index 332f2a4..477472b 100644 --- a/lib/librte_eal/common/include/rte_common.h +++ b/lib/librte_eal/common/include/rte_common.h @@ -268,7 +268,8 @@ rte_align64pow2(uint64_t v) /** * Macro to return the minimum of two numbers */ -#define RTE_MIN(a, b) ({ \ +#define RTE_MIN(a, b) \ + __extension__ ({ \ typeof (a) _a = (a); \ typeof (b) _b = (b); \ _a < _b ? _a : _b; \ @@ -277,7 +278,8 @@ rte_align64pow2(uint64_t v) /** * Macro to return the maximum of two numbers */ -#define RTE_MAX(a, b) ({ \ +#define RTE_MAX(a, b) \ + __extension__ ({ \ typeof (a) _a = (a); \ typeof (b) _b = (b); \ _a > _b ? _a : _b; \ -- 2.1.4