summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorFerruh Yigit <ferruh.yigit@intel.com>2019-01-14 15:49:35 +0000
committerThomas Monjalon <thomas@monjalon.net>2019-01-14 17:27:48 +0100
commita32ca9a4ebc1350ce48df0222decef95a72b742b (patch)
treedba4242ba996025414bf1935a66a4e1a49f11552 /mk
parentbf78d4dc2ba64e69fda4cc569f99cfb4c806474a (diff)
downloaddpdk-next-eventdev-a32ca9a4ebc1350ce48df0222decef95a72b742b.zip
dpdk-next-eventdev-a32ca9a4ebc1350ce48df0222decef95a72b742b.tar.gz
dpdk-next-eventdev-a32ca9a4ebc1350ce48df0222decef95a72b742b.tar.xz
mk: fix scope of disabling AVX512F support
AVX512 was disabled for GCC because of Bugzilla issue 97 [1], the GCC defect submitted for the issue [2] highlighted that this is a known binutils version 2.30 issue. Narrowed the scope of no-avx512 to the this specific binutils version. [1] https://bugs.dpdk.org/show_bug.cgi?id=97 [2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=88096 Fixes: 8d07c82b239f ("mk: disable gcc AVX512F support") Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> Acked-by: Thomas Monjalon <thomas@monjalon.net>
Diffstat (limited to 'mk')
-rw-r--r--mk/rte.cpuflags.mk4
-rw-r--r--mk/toolchain/gcc/rte.toolchain-compat.mk10
2 files changed, 12 insertions, 2 deletions
diff --git a/mk/rte.cpuflags.mk b/mk/rte.cpuflags.mk
index c3291b1..541211c 100644
--- a/mk/rte.cpuflags.mk
+++ b/mk/rte.cpuflags.mk
@@ -69,8 +69,8 @@ ifneq ($(filter $(AUTO_CPUFLAGS),__AVX512F__),)
ifeq ($(CONFIG_RTE_ENABLE_AVX512),y)
CPUFLAGS += AVX512F
else
-# disable AVX512F support of gcc as a workaround for Bug 97
-ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
+# disable AVX512F support for GCC & binutils 2.30 as a workaround for Bug 97
+ifeq ($(FORCE_DISABLE_AVX512),y)
MACHINE_CFLAGS += -mno-avx512f
endif
endif
diff --git a/mk/toolchain/gcc/rte.toolchain-compat.mk b/mk/toolchain/gcc/rte.toolchain-compat.mk
index 4490429..dbddc98 100644
--- a/mk/toolchain/gcc/rte.toolchain-compat.mk
+++ b/mk/toolchain/gcc/rte.toolchain-compat.mk
@@ -20,6 +20,16 @@ HOST_GCC_MINOR = $(shell echo __GNUC_MINOR__ | $(HOSTCC) -E -x c - | tail -n 1)
HOST_GCC_PATCHLEVEL = $(shell echo __GNUC_PATCHLEVEL__ | $(HOSTCC) -E -x c - | tail -n 1)
HOST_GCC_VERSION = $(HOST_GCC_MAJOR)$(HOST_GCC_MINOR)
+LD_VERSION = $(shell $(LD) -v)
+# disable AVX512F support for GCC & binutils 2.30 as a workaround for Bug 97
+ifneq ($(filter 2.30%,$(LD_VERSION)),)
+FORCE_DISABLE_AVX512 := y
+# print warning only once for librte_eal
+ifneq ($(filter %librte_eal,$(CURDIR)),)
+$(warning AVX512 support disabled because of ld 2.30. See Bug 97)
+endif
+endif
+
# if GCC is older than 4.x
ifeq ($(shell test $(GCC_VERSION) -lt 40 && echo 1), 1)
MACHINE_CFLAGS =