From 78edb8e722fe2bb72ba7f8e63b420733c7fb51c6 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Mon, 6 Feb 2017 22:28:52 +0100 Subject: Multiple platofrm support for dpdk/Makefile, fix optimizations Using -march=native was causing SIGILLs on Atoms. Change-Id: I98c7fdaa139e3db70c972950dc9c167bf5803656 Signed-off-by: Damjan Marion --- build-data/platforms/thunder.mk | 36 ------------------------------------ build-data/platforms/vpp.mk | 3 --- 2 files changed, 39 deletions(-) delete mode 100644 build-data/platforms/thunder.mk (limited to 'build-data/platforms') diff --git a/build-data/platforms/thunder.mk b/build-data/platforms/thunder.mk deleted file mode 100644 index 31b6a510..00000000 --- a/build-data/platforms/thunder.mk +++ /dev/null @@ -1,36 +0,0 @@ -# Override OS so we can use the sdk toolchain instead of building one -thunder_os = thunderx-linux-gnu - -# Override CROSS_LDFLAGS so we can use -# /lib/aarch64-linux-gnu/ld-linux-aarch64.so.1 instead of building glibc -thunder_cross_ldflags = \ - -Wl,--dynamic-linker=/lib/aarch64-linux-gnu/ld-linux-aarch64.so.1 \ - -Wl,-rpath -Wl,$(lots_of_slashes_to_pad_names)$(TOOL_INSTALL_LIB_DIR) - -thunder_arch = aarch64 -# suppress -march=foo, the cross compiler doesn't understand it -thunder_march = " " - -thunder_root_packages = vppinfra vlib-cavium-dpdk vnet-cavium-dpdk cavium-dpdk \ - vpp-cavium-dpdk vpp-api-test-cavium-dpdk - -vnet-cavium-dpdk_configure_args_thunder = \ - --with-dpdk --without-libssl - -vpp-cavium-dpdk_configure_args_thunder = \ - --with-dpdk --without-libssl - -cavium-dpdk_configure_args_thunder = --with-headroom=256 - -vlib-cavium-dpdk_configure_args_thunder = --with-pre-data=128 - -# native tool chain additions for this platform -thunder_native_tools = vppapigen - -thunder_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -thunder_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG - -thunder_TAG_CFLAGS = -g -O2 -thunder_TAG_LDFLAGS = -g -O2 - - diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk index ee307639..401a383a 100644 --- a/build-data/platforms/vpp.mk +++ b/build-data/platforms/vpp.mk @@ -16,17 +16,14 @@ vpp_arch = native ifeq ($(shell uname -m),x86_64) vpp_march = corei7 # Nehalem Instruction set vpp_mtune = corei7-avx # Optimize for Sandy Bridge -vpp_dpdk_arch = corei7 else ifeq ($(shell uname -m),aarch64) ifeq ($(TARGET_PLATFORM),thunderx) vpp_march = armv8-a+crc vpp_mtune = thunderx -vpp_dpdk_arch = armv8a vpp_dpdk_target = arm64-thunderx-linuxapp-gcc else vpp_march = native vpp_mtune = generic -vpp_dpdk_arch = native endif endif vpp_native_tools = vppapigen -- cgit 1.2.3-korg