Disable for gcc < 4.7 and icc <= 14.0 PMD uses some compiler builtins and new compiler options. Tested with gcc 4.5.1 and following were not supported:
option: -Ofast macros: _Static_assert __ORDER_LITTLE_ENDIAN__ __ORDER_BIG_ENDIAN__ __BYTE_ORDER__ __atomic_fetch_add __ATOMIC_ACQUIRE __atomic_load_n __ATOMIC_RELAXED __atomic_store_n __ATOMIC_RELEASE It is not easy to fix all in PMD, disabling PMD for older compilers. Signed-off-by: Ferruh Yigit <ferruh.yi...@intel.com> --- drivers/net/thunderx/Makefile | 15 +++++++++++++++ mk/toolchain/gcc/rte.toolchain-compat.mk | 4 ++++ mk/toolchain/icc/rte.toolchain-compat.mk | 4 ++++ 3 files changed, 23 insertions(+) diff --git a/drivers/net/thunderx/Makefile b/drivers/net/thunderx/Makefile index 706250b..f2acfcb 100644 --- a/drivers/net/thunderx/Makefile +++ b/drivers/net/thunderx/Makefile @@ -60,8 +60,23 @@ SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_ethdev.c SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_bsvf.c SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_svf.c +# GCC ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) CFLAGS_nicvf_rxtx.o += -fno-prefetch-loop-arrays + +# Disable PMD for gcc < 4.7 in mk/toolchain/gcc/rte.toolchain-compat.mk +ifeq ($(shell test $(GCC_VERSION) -lt 47 && echo 1), 1) +$(warning thunderx pmd not supported by gcc < 4.7) +endif + +# ICC +else ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) + +# Disable PMD for icc <= 14.0 in mk/toolchain/gcc/rte.toolchain-compat.mk +ifeq ($(shell test $(ICC_MAJOR_VERSION) -le 14 && echo 1), 1) +$(warning thunderx pmd not supported by icc <= 14.0) +endif + endif CFLAGS_nicvf_rxtx.o += -Ofast diff --git a/mk/toolchain/gcc/rte.toolchain-compat.mk b/mk/toolchain/gcc/rte.toolchain-compat.mk index 6eed20c..fff14e1 100644 --- a/mk/toolchain/gcc/rte.toolchain-compat.mk +++ b/mk/toolchain/gcc/rte.toolchain-compat.mk @@ -89,4 +89,8 @@ else ifeq ($(shell test $(GCC_VERSION) -lt 42 && echo 1), 1) MACHINE_CFLAGS := $(filter-out -march% -mtune% -msse%,$(MACHINE_CFLAGS)) endif + + ifeq ($(shell test $(GCC_VERSION) -lt 47 && echo 1), 1) + CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD=n + endif endif diff --git a/mk/toolchain/icc/rte.toolchain-compat.mk b/mk/toolchain/icc/rte.toolchain-compat.mk index 4134466..2d0e54b 100644 --- a/mk/toolchain/icc/rte.toolchain-compat.mk +++ b/mk/toolchain/icc/rte.toolchain-compat.mk @@ -64,6 +64,10 @@ else MACHINE_CFLAGS := $(patsubst -march=core-avx2,-xCORE-AVX2,$(MACHINE_CFLAGS)) # remove westmere flags MACHINE_CFLAGS := $(filter-out -mpclmul -maes,$(MACHINE_CFLAGS)) + + ifeq ($(shell test $(ICC_MAJOR_VERSION) -le 14 && echo 1), 1) + CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD=n + endif endif # if icc version == 12.0 ifeq ($(shell test $(ICC_MAJOR_VERSION) -eq 12 && test $(ICC_MINOR_VERSION) -eq 0 && echo 1), 1) -- 2.9.3