From ba3c77364cc8b7dfb136e955458177e1a9a14c98 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Fri, 10 Nov 2017 20:26:50 +0100 Subject: Handle CPU flags from autotools project Change-Id: Id085c1e3cbc7bf03df02755f9e35896cdb57e9e3 Signed-off-by: Damjan Marion --- build-data/platforms/vpp.mk | 44 +++++++++++++------------------------------- 1 file changed, 13 insertions(+), 31 deletions(-) (limited to 'build-data/platforms') diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk index f764a1f9ae5..9f01a656e0b 100644 --- a/build-data/platforms/vpp.mk +++ b/build-data/platforms/vpp.mk @@ -16,18 +16,8 @@ MACHINE=$(shell uname -m) vpp_arch = native -ifeq ($(MACHINE),$(filter $(MACHINE),x86_64 i686)) -vpp_march = corei7 # Nehalem Instruction set -vpp_mtune = corei7-avx # Optimize for Sandy Bridge -else ifeq ($(MACHINE),aarch64) ifeq ($(TARGET_PLATFORM),thunderx) -vpp_march = armv8-a+crc -vpp_mtune = thunderx vpp_dpdk_target = arm64-thunderx-linuxapp-gcc -else -vpp_march = native -vpp_mtune = generic -endif endif vpp_native_tools = vppapigen @@ -56,28 +46,20 @@ endif # uncomment the following... # vpp_configure_args_vpp += --disable-vom -vpp_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \ +vpp_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 \ -fstack-protector-all -fPIC -Werror -vpp_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \ +vpp_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 \ -fstack-protector-all -fPIC -Werror -vpp_TAG_CFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -march=$(MARCH) -mtune=$(MTUNE) \ - -fstack-protector -fPIC -Werror -vpp_TAG_LDFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -march=$(MARCH) -mtune=$(MTUNE) \ - -fstack-protector -fPIC -Werror - -vpp_clang_TAG_CFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -march=$(MARCH) -mtune=$(MTUNE) \ - -fstack-protector -fPIC -Werror -vpp_clang_TAG_LDFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -march=$(MARCH) -mtune=$(MTUNE) \ - -fstack-protector -fPIC -Werror - -vpp_gcov_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \ - -fPIC -Werror -fprofile-arcs -ftest-coverage -vpp_gcov_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \ - -fPIC -Werror -coverage - -vpp_coverity_TAG_CFLAGS = -g -O2 -march=$(MARCH) -mtune=$(MTUNE) \ - -fPIC -Werror -D__COVERITY__ -vpp_coverity_TAG_LDFLAGS = -g -O2 -march=$(MARCH) -mtune=$(MTUNE) \ - -fPIC -Werror -D__COVERITY__ +vpp_TAG_CFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -fstack-protector -fPIC -Werror +vpp_TAG_LDFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -fstack-protector -fPIC -Werror + +vpp_clang_TAG_CFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -fstack-protector -fPIC -Werror +vpp_clang_TAG_LDFLAGS = -g -O2 -DFORTIFY_SOURCE=2 -fstack-protector -fPIC -Werror + +vpp_gcov_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -fPIC -Werror -fprofile-arcs -ftest-coverage +vpp_gcov_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -fPIC -Werror -coverage + +vpp_coverity_TAG_CFLAGS = -g -O2 -fPIC -Werror -D__COVERITY__ +vpp_coverity_TAG_LDFLAGS = -g -O2 -fPIC -Werror -D__COVERITY__ -- cgit 1.2.3-korg