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 Tested compilation on x86 with gcc and clang Signed-off-by: Ashwin Sekhar T K <ashwin.sek...@caviumnetworks.com> --- v3: * Moved changes for GCC_VERSION into a separate commit * Moved GCC_VERSION definition to common header * Removed the same from rte_lru.h lib/librte_eal/common/include/rte_common.h | 8 ++++++++ lib/librte_table/rte_lru.h | 6 ------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h index e057f6e..717b445 100644 --- a/lib/librte_eal/common/include/rte_common.h +++ b/lib/librte_eal/common/include/rte_common.h @@ -66,6 +66,14 @@ extern "C" { #define RTE_STD_C11 #endif +/** Define GCC_VERSION **/ +#ifdef __GNUC__ +#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + \ + __GNUC_PATCHLEVEL__) +#else +#define GCC_VERSION (0) +#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 e87e062..3c5aca7 100644 --- a/lib/librte_table/rte_lru.h +++ b/lib/librte_table/rte_lru.h @@ -40,12 +40,6 @@ extern "C" { #include <stdint.h> -#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 -- 2.7.4