diff options
| author |   Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2019-04-15 14:36:48 +0200 |
|---|---|---|
| committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2019-04-15 14:39:46 +0200 |
| commit | e2bea7436061ca2e7e14bfcfdc5870f2555c3965 (patch) | |
| tree | 46c62ce8f227674d6880430f9623edb4e77b9f9a /mk | |
| parent | a4f0fa29488e582ab8b5ef9db475b3d26ded690c (diff) | |
New upstream version 18.11.1
Change-Id: Ic52e74a9ed6f3ae06acea4a27357bd7153efc2a3
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/rte.cpuflags.mk | 4 | ||||
| -rw-r--r-- | mk/rte.sdkinstall.mk | 5 | ||||
| -rw-r--r-- | mk/toolchain/gcc/rte.toolchain-compat.mk | 10 |
3 files changed, 15 insertions, 4 deletions
diff --git a/mk/rte.cpuflags.mk b/mk/rte.cpuflags.mk index c3291b17..541211c6 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/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index 8296e6db..2d34b4e5 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -99,8 +99,9 @@ install-runtime: --exclude 'app/cmdline*' --exclude app/test \ --exclude app/testacl --exclude app/testpipeline app | \ tar -xf - -C $(DESTDIR)$(bindir) $(TAR_X_FLAGS) - $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)) - $(Q)cp $(CP_FLAGS) $(RTE_SDK)/usertools $(DESTDIR)$(datadir) + $(Q)$(call rte_mkdir, $(DESTDIR)$(datadir)/usertools) + $(Q)tar -cf - -C $(RTE_SDK) --exclude meson.build usertools | \ + tar -xf - -C $(DESTDIR)$(datadir)/usertools $(TAR_X_FLAGS) $(Q)$(call rte_mkdir, $(DESTDIR)$(sbindir)) $(Q)$(call rte_symlink, $(DESTDIR)$(datadir)/usertools/dpdk-devbind.py, \ $(DESTDIR)$(sbindir)/dpdk-devbind) diff --git a/mk/toolchain/gcc/rte.toolchain-compat.mk b/mk/toolchain/gcc/rte.toolchain-compat.mk index 44904295..dbddc986 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 = |