aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2016-06-28 19:10:41 +0200
committerDamjan Marion <damarion@cisco.com>2016-06-28 19:10:41 +0200
commit154d445f7f8f1553d9bb00d1be42bf1b06eda9f1 (patch)
tree11ba54c5d97e1554f8d9547c41b6bd924a39271d
parenta06dfb39c6bee3fbfd702c10e1e1416b98e65455 (diff)
Fix native build on non x86_64 systems
Change-Id: Iab9f6793112f19a5b54a555623d84099aa8bb03e Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--build-data/platforms/vpp.mk6
-rw-r--r--build-data/platforms/vpp_lite.mk5
-rw-r--r--vnet/vnet/devices/nic/ixge.c2
3 files changed, 13 insertions, 0 deletions
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index ec0d874db4b..9026ad3214c 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -13,9 +13,15 @@
# vector packet processor
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
+vpp_march = native
+vpp_mtune = generic
+vpp_dpdk_arch = native
+endif
vpp_native_tools = vppapigen
vpp_uses_dpdk = yes
diff --git a/build-data/platforms/vpp_lite.mk b/build-data/platforms/vpp_lite.mk
index a28fec2fbe2..9375a7a90e3 100644
--- a/build-data/platforms/vpp_lite.mk
+++ b/build-data/platforms/vpp_lite.mk
@@ -13,8 +13,13 @@
# vector packet processor
vpp_lite_arch = native
+ifeq ($(shell uname -m),x86_64)
vpp_lite_march = corei7 # Nehalem Instruction set
vpp_lite_mtune = corei7-avx # Optimize for Sandy Bridge
+else
+vpp_lite_march = native
+vpp_lite_mtune = generic
+endif
vpp_lite_native_tools = vppapigen
vpp_lite_uses_dpdk = no
diff --git a/vnet/vnet/devices/nic/ixge.c b/vnet/vnet/devices/nic/ixge.c
index cd08379ef78..b98e7d9c3af 100644
--- a/vnet/vnet/devices/nic/ixge.c
+++ b/vnet/vnet/devices/nic/ixge.c
@@ -20,6 +20,7 @@
* Please use supported DPDK driver instead.
*/
+#if __x86_64__
#include <vppinfra/vector.h>
#ifndef CLIB_HAVE_VEC128
@@ -2815,3 +2816,4 @@ void ixge_set_next_node (ixge_rx_next_t next, char *name)
break;
}
}
+#endif