Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix unlinking of /dev/shm files.
[vpp.git]
/
build-data
/
platforms
/
vpp.mk
diff --git
a/build-data/platforms/vpp.mk
b/build-data/platforms/vpp.mk
index
ee30763
..
acbe0e7
100644
(file)
--- a/
build-data/platforms/vpp.mk
+++ b/
build-data/platforms/vpp.mk
@@
-12,21
+12,21
@@
# limitations under the License.
# vector packet processor
# limitations under the License.
# vector packet processor
+
+MACHINE=$(shell uname -m)
+
vpp_arch = native
vpp_arch = native
-ifeq ($(
shell uname -m),x86_64
)
+ifeq ($(
MACHINE),$(filter $(MACHINE),x86_64 i686)
)
vpp_march = corei7 # Nehalem Instruction set
vpp_mtune = corei7-avx # Optimize for Sandy Bridge
vpp_march = corei7 # Nehalem Instruction set
vpp_mtune = corei7-avx # Optimize for Sandy Bridge
-vpp_dpdk_arch = corei7
-else ifeq ($(shell uname -m),aarch64)
+else ifeq ($(MACHINE),aarch64)
ifeq ($(TARGET_PLATFORM),thunderx)
vpp_march = armv8-a+crc
vpp_mtune = thunderx
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_target = arm64-thunderx-linuxapp-gcc
else
vpp_march = native
vpp_mtune = generic
-vpp_dpdk_arch = native
endif
endif
vpp_native_tools = vppapigen
endif
endif
vpp_native_tools = vppapigen
@@
-36,12
+36,7
@@
vpp_uses_dpdk = yes
# Uncoment to enable building unit tests
# vpp_enable_tests = yes
# Uncoment to enable building unit tests
# vpp_enable_tests = yes
-vpp_root_packages = vpp gmod
-
-vpp_configure_args_vpp = --with-dpdk
-
-# Set these parameters carefully. The vlib_buffer_t is 128 bytes, i.e.
-vlib_configure_args_vpp = --with-pre-data=128
+vpp_root_packages = vpp
# DPDK configuration parameters
# vpp_uses_dpdk_cryptodev_sw = yes
# DPDK configuration parameters
# vpp_uses_dpdk_cryptodev_sw = yes
@@
-51,6
+46,11
@@
vlib_configure_args_vpp = --with-pre-data=128
# vpp_dpdk_lib_dir = /usr/lib
# vpp_dpdk_shared_lib = yes
# vpp_dpdk_lib_dir = /usr/lib
# vpp_dpdk_shared_lib = yes
+# load balancer plugin is not portable on 32 bit platform
+ifeq ($(MACHINE),i686)
+vpp_configure_args_vpp = --disable-lb-plugin
+endif
+
vpp_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \
-fstack-protector-all -fPIC -Werror
vpp_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \
vpp_debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \
-fstack-protector-all -fPIC -Werror
vpp_debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \