[06/10] build/zdtm: Makefile hack for travis aarch64/armv8l

Submitted by Dmitry Safonov on Nov. 21, 2019, 9:56 p.m.

Details

Message ID 20191121215643.275552-7-dima@arista.com
State Accepted
Series "build: Test and support armv7 cross"
Commit 35d1e07911c5ac8a5923196710c680d0fec01c9c
Headers show

Commit Message

Dmitry Safonov Nov. 21, 2019, 9:56 p.m.
The very same hack to build aarch32 zdtm tests on armv8 Travis-CI
as in the commit dfa0a1edcbcb ("Makefile hack for travis
aarch64/armv8l")

Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 test/zdtm/Makefile.inc | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

Patch hide | download patch | download mbox

diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index 8f2650b44043..d132ca98175c 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -20,13 +20,17 @@  ifeq ($(ARCH),arm64)
 endif
 
 ifeq ($(ARCH),arm)
-	ARMV := $(shell echo $(SUBARCH) | sed -nr 's/armv([[:digit:]]).*/\1/p; t; i7')
-
-	ifeq ($(ARMV),6)
-		USERCFLAGS += -march=armv6
-	else ifeq ($(ARMV),7)
-		USERCFLAGS += -march=armv7-a
-	endif
+        ARMV := $(shell echo $(SUBARCH) | sed -nr 's/armv([[:digit:]]).*/\1/p; t; i7')
+
+        ifeq ($(ARMV),6)
+                USERCFLAGS += -march=armv6
+        else ifeq ($(ARMV),7)
+                USERCFLAGS += -march=armv7-a
+        else ifeq ($(ARMV),8)
+                # To build aarch32 on armv8 Travis-CI (see criu Makefile)
+                USERCFLAGS += -march=armv7-a
+                ARMV := 7
+        endif
 endif
 
 HOSTCC	?= gcc