From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ashwin Sekhar T K Subject: [PATCH v5 2/4] eal: move gcc version definition to common header Date: Fri, 12 May 2017 03:15:33 -0700 Message-ID: <20170512101535.7221-3-ashwin.sekhar@caviumnetworks.com> References: <20170427140618.35897-1-ashwin.sekhar@caviumnetworks.com> <20170512101535.7221-1-ashwin.sekhar@caviumnetworks.com> Mime-Version: 1.0 Content-Type: text/plain Cc: dev@dpdk.org, Ashwin Sekhar T K To: jerin.jacob@caviumnetworks.com, thomas@monjalon.net, viktorin@rehivetech.com, jianbo.liu@linaro.org, jasvinder.singh@intel.com Return-path: Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0068.outbound.protection.outlook.com [104.47.36.68]) by dpdk.org (Postfix) with ESMTP id 0AEA65951 for ; Fri, 12 May 2017 12:15:54 +0200 (CEST) In-Reply-To: <20170512101535.7221-1-ashwin.sekhar@caviumnetworks.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Moved the definition of GCC_VERSION from lib/librte_table/rte_lru.h to lib/librte_eal/common/include/rte_common.h. Tested compilation on: * arm64 with gcc * x86 with gcc and clang Signed-off-by: Ashwin Sekhar T K Reviewed-by: Jan Viktorin --- lib/librte_eal/common/include/rte_common.h | 6 ++++++ lib/librte_table/rte_lru.h | 10 ++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h index e057f6e21..ff4a12bbe 100644 --- a/lib/librte_eal/common/include/rte_common.h +++ b/lib/librte_eal/common/include/rte_common.h @@ -66,6 +66,12 @@ extern "C" { #define RTE_STD_C11 #endif +/** Define GCC_VERSION **/ +#ifdef RTE_TOOLCHAIN_GCC +#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + \ + __GNUC_PATCHLEVEL__) +#endif + #ifdef RTE_ARCH_STRICT_ALIGN typedef uint64_t unaligned_uint64_t __attribute__ ((aligned(1))); typedef uint32_t unaligned_uint32_t __attribute__ ((aligned(1))); diff --git a/lib/librte_table/rte_lru.h b/lib/librte_table/rte_lru.h index e87e062d0..5cc596613 100644 --- a/lib/librte_table/rte_lru.h +++ b/lib/librte_table/rte_lru.h @@ -40,12 +40,6 @@ extern "C" { #include -#ifdef __INTEL_COMPILER -#define GCC_VERSION (0) -#else -#define GCC_VERSION (__GNUC__ * 10000+__GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__) -#endif - #ifndef RTE_TABLE_HASH_LRU_STRATEGY #ifdef __SSE4_2__ #define RTE_TABLE_HASH_LRU_STRATEGY 2 @@ -120,7 +114,7 @@ do { \ #elif RTE_TABLE_HASH_LRU_STRATEGY == 2 -#if GCC_VERSION > 40306 +#if defined(RTE_TOOLCHAIN_GCC) && (GCC_VERSION > 40306) #include #else #include @@ -166,7 +160,7 @@ do { \ #elif RTE_TABLE_HASH_LRU_STRATEGY == 3 -#if GCC_VERSION > 40306 +#if defined(RTE_TOOLCHAIN_GCC) && (GCC_VERSION > 40306) #include #else #include -- 2.12.2