From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adrien Mazarguil Subject: [PATCH] eal: fix cpu_feature_table[] compilation with -pedantic Date: Mon, 29 Jun 2015 11:34:52 +0200 Message-ID: <1435570492-19291-1-git-send-email-adrien.mazarguil@6wind.com> References: <6446943.entjzpE8eR@xps13> Cc: dev@dpdk.org To: Thomas Monjalon Return-path: Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by dpdk.org (Postfix) with ESMTP id 71BF9C49C for ; Mon, 29 Jun 2015 11:35:11 +0200 (CEST) Received: by wicnd19 with SMTP id nd19so65759760wic.1 for ; Mon, 29 Jun 2015 02:35:11 -0700 (PDT) In-Reply-To: <6446943.entjzpE8eR@xps13> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Since the commit below includes rte_cpuflags.h in rte_spinlock.h, compilation of the mlx4 driver fails when CONFIG_RTE_LIBRTE_MLX4_DEBUG=y. This mode adds -pedantic to the compiler's command line for mlx4, which complains about the static definition of an empty cpu_feature_table[] in common rte_cpuflags.h, then about its redefinition as a larger array in arch-specific rte_cpuflags.h. While DPDK does not officially support -pedantic internally, external applications may enable it and include rte_spinlock.h from the public API. Instead of removing -pedantic from mlx4, this commit fixes rte_cpuflags.h. Fixes: ba7468997ea6 ("spinlock: add HTM lock elision for x86") Signed-off-by: Adrien Mazarguil --- lib/librte_eal/common/include/generic/rte_cpuflags.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/librte_eal/common/include/generic/rte_cpuflags.h b/lib/librte_eal/common/include/generic/rte_cpuflags.h index a04e021..61c4db1 100644 --- a/lib/librte_eal/common/include/generic/rte_cpuflags.h +++ b/lib/librte_eal/common/include/generic/rte_cpuflags.h @@ -74,8 +74,12 @@ struct feature_entry { /** * An array that holds feature entries + * + * Defined in arch-specific rte_cpuflags.h. */ +#ifdef __DOXYGEN__ static const struct feature_entry cpu_feature_table[]; +#endif /** * Execute CPUID instruction and get contents of a specific register -- 2.1.0