summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2017-04-24 20:48:53 +0200
committerNeale Ranns <nranns@cisco.com>2017-04-25 07:38:49 +0000
commit1664f9ba4a154f6d11870e0bb9fdaa527b5afbaf (patch)
tree73dfeb10e87420e50cf84c2a34111bf3eb4bd38f
parent36c1308b35baac817c2c0b21335b1eed02689f0a (diff)
Add support for 32-bit x86 compilation in Makefiles
Change-Id: Ida73678b47b685abef4e81b5cad9fc13eb330850 Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--build-data/platforms/vpp.mk7
-rw-r--r--dpdk/Makefile8
2 files changed, 10 insertions, 5 deletions
diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index c61375d8994..5aafdd76f40 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -12,11 +12,14 @@
# limitations under the License.
# vector packet processor
+
+MACHINE=$(shell uname -m)
+
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
-else ifeq ($(shell uname -m),aarch64)
+else ifeq ($(MACHINE),aarch64)
ifeq ($(TARGET_PLATFORM),thunderx)
vpp_march = armv8-a+crc
vpp_mtune = thunderx
diff --git a/dpdk/Makefile b/dpdk/Makefile
index c46ef0f125e..23e84ef4e1e 100644
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -50,11 +50,13 @@ else
DPDK_CC=gcc
endif
+MACHINE=$(shell uname -m)
+
##############################################################################
-# Intel x86_64
+# Intel x86
##############################################################################
-ifeq ($(shell uname -m),x86_64)
-DPDK_TARGET ?= x86_64-native-linuxapp-$(DPDK_CC)
+ifeq ($(MACHINE),$(filter $(MACHINE),x86_64 i686))
+DPDK_TARGET ?= $(MACHINE)-native-linuxapp-$(DPDK_CC)
DPDK_MACHINE ?= nhm
DPDK_TUNE ?= core-avx2