From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by dpdk.org (Postfix) with ESMTP id 8D70F3978 for ; Wed, 13 Jul 2016 15:03:23 +0200 (CEST) Received: by mail-wm0-f42.google.com with SMTP id f126so28177987wma.1 for ; Wed, 13 Jul 2016 06:03:23 -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=Rxr4T4+FvYViP5d1fqiSm70fMNV6OUjv2tKEaE8fqME=; b=fqV2peXAMvNsX9fym9nzK5PR84LK4AyFNSNzjBTTC15dvDhjy2HaMC5RzG7tEqJlds mQF8l5HcUffwecUp533wovtRosnw2v0tqvj2VrOBIaPIJ6OizT1AXZATxfRCDjdJ8BGo Ei8S3fXxzoGY1HnJZL61yOgmcEQYce11u5EGCI9ObebENME3bylIkUgU5wCU461oIQaA WIUqBEQVDfhh9CawhqSanj+DuVKVpBM4+L4uVmKxcUkCHQlsOOqt1HpP5mD03OCdnbmr be1Adq53heDhUBfVAZ741PzJmm54AE03X1x0FlNhq6rpnwv1idUez3cC5DDI7AOGHLJE u3gA== 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=Rxr4T4+FvYViP5d1fqiSm70fMNV6OUjv2tKEaE8fqME=; b=EpuoumVnrtBYm9vGyIzPOzTIuryZPa4xmDY5z8fn/MXBey3WEuHMa3FLSVqWvxropL jKKh8s1PB5G1ZMSyina2eKAIpHAr/I4TmF6q8QnRgZ2E33+eYxQwj58JpTXCS7e3bUsh YcQooKXMM4EVg22Ag5Xav0PU8Qbcn3SLZCrxDrTk5s/JRb3Ytl4zToPD9B+l7fDIC0V6 Zo8F85pAcQFySxiANfEA2GRSUzr8xz4FA4xFvLsGx4ItzZKtW93jzmQwlcHprJ+yBY3q jOBeQZyM4IwUZsCt3xjwSDnmTm0iF5TPxhBVB1+SqaPHbrZf/hhpl8fDoYji1MWMtxiX SdFg== X-Gm-Message-State: ALyK8tKZr8+kT1qB//OXfE5ACCrluXuSBaNcyPDqymMtJEbRrYjB8YQ1CFAxZSaz1X6CrytU X-Received: by 10.194.179.70 with SMTP id de6mr942130wjc.173.1468415003049; Wed, 13 Jul 2016 06:03:23 -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 si8sm827871wjb.12.2016.07.13.06.03.21 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 13 Jul 2016 06:03:22 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Date: Wed, 13 Jul 2016 15:02:38 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v4 01/10] 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: Wed, 13 Jul 2016 13:03:23 -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..c3a2619 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..ca9d1dc 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