This submit updates the CROSS setting to support native build on
TileGx platform. It also enable the combined library by default.
Signed-off-by: Liming Sun <lsun at ezchip.com>
Acked-by: Zhigang Lu <zlu at ezchip.com>
---
MAINTAINERS | 3 ++-
config/defconfig_tile-tilegx-linuxapp-gcc | 4 ++++
mk/arch/tile/rte.vars.mk | 6 ++++++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 3292e84..8f7e9ca 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -138,8 +138,9 @@ M: Jianbo Liu <jianbo.liu at linaro.org>
F: lib/librte_eal/common/include/arch/arm/*_64.h
F: lib/librte_acl/acl_run_neon.*
-EZchip TILE-Gx
+EZchip TILE-Gx/Mx
M: Zhigang Lu <zlu at ezchip.com>
+M: Liming Sun <lsun at ezchip.com>
F: lib/librte_eal/common/include/arch/tile/
F: drivers/net/mpipe/
diff --git a/config/defconfig_tile-tilegx-linuxapp-gcc
b/config/defconfig_tile-tilegx-linuxapp-gcc
index 9df9d7f..fb61bcd 100644
--- a/config/defconfig_tile-tilegx-linuxapp-gcc
+++ b/config/defconfig_tile-tilegx-linuxapp-gcc
@@ -70,3 +70,7 @@ CONFIG_RTE_LIBRTE_SCHED=n
CONFIG_RTE_LIBRTE_PORT=n
CONFIG_RTE_LIBRTE_TABLE=n
CONFIG_RTE_LIBRTE_PIPELINE=n
+CONFIG_RTE_LIBRTE_CXGBE_PMD=n
+
+# Compile combined lib by default.
+CONFIG_RTE_BUILD_COMBINE_LIBS=y
diff --git a/mk/arch/tile/rte.vars.mk b/mk/arch/tile/rte.vars.mk
index b518986..06dab18 100644
--- a/mk/arch/tile/rte.vars.mk
+++ b/mk/arch/tile/rte.vars.mk
@@ -30,7 +30,13 @@
ARCH ?= tile
+
+HOST_ARCH := ${shell uname -m}
+ifneq ($(filter tile%,${HOST_ARCH}),)
+CROSS =
+else
CROSS ?= tile-
+endif
CPU_CFLAGS ?=
CPU_LDFLAGS ?=
--
1.8.3.1
