d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eal: move gcc version definition to common header

Browse Source 
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 <ashwin.sekhar@caviumnetworks.com>
Reviewed-by: Jan Viktorin <viktorin@rehivetech.com>
Acked-by: Jianbo Liu <jianbo.liu@linaro.org>
This commit is contained in:
Ashwin Sekhar T K 2017-07-04 02:24:06 -07:00 committed by Thomas Monjalon
parent 34e5913067
commit 266451e419
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/librte_eal/common/include/rte_common.h
View File

@ -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)));

10
lib/librte_table/rte_lru_x86.h
View File

@ -40,19 +40,13 @@ 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
#define RTE_TABLE_HASH_LRU_STRATEGY 2
#endif
#if RTE_TABLE_HASH_LRU_STRATEGY == 2
#if GCC_VERSION > 40306
#if defined(RTE_TOOLCHAIN_GCC) && (GCC_VERSION > 40306)
#include <x86intrin.h>
#else
#include <emmintrin.h>
@ -96,7 +90,7 @@ do { \
#elif RTE_TABLE_HASH_LRU_STRATEGY == 3
#if GCC_VERSION > 40306
#if defined(RTE_TOOLCHAIN_GCC) && (GCC_VERSION > 40306)
#include <x86intrin.h>
#else
#include <emmintrin.h>