mirror of
https://github.com/checkpoint-restore/criu.git
synced 2026-07-18 00:58:31 +00:00
Makefile hack for travis aarch64/armv8l
For CRIU's compile only tests for armv7hf on Travis we are using 'setarch linux32' which returns armv8l on Travis aarch64. This adds a path in the Makefile to treat armv8l just as armv7hf during compile. This enables us to run armv7hf compile tests on Travis aarch64 hardware. Much faster. Maybe not entirely correct, but probably good enough for compile testing in an armv7hf container. Signed-off-by: Adrian Reber <areber@redhat.com>
This commit is contained in:
parent
1918f368d4
commit
dfa0a1edcb
1 changed files with 10 additions and 1 deletions
11
Makefile
11
Makefile
|
|
@ -35,7 +35,6 @@ endif
|
|||
# Architecture specific options.
|
||||
ifeq ($(ARCH),arm)
|
||||
ARMV := $(shell echo $(UNAME-M) | sed -nr 's/armv([[:digit:]]).*/\1/p; t; i7')
|
||||
DEFINES := -DCONFIG_ARMV$(ARMV) -DCONFIG_VDSO_32
|
||||
|
||||
ifeq ($(ARMV),6)
|
||||
USERCFLAGS += -march=armv6
|
||||
|
|
@ -45,6 +44,16 @@ ifeq ($(ARCH),arm)
|
|||
USERCFLAGS += -march=armv7-a
|
||||
endif
|
||||
|
||||
ifeq ($(ARMV),8)
|
||||
# Running 'setarch linux32 uname -m' returns armv8l on travis aarch64.
|
||||
# This tells CRIU to handle armv8l just as armv7hf. Right now this is
|
||||
# only used for compile testing. No further verification of armv8l exists.
|
||||
USERCFLAGS += -march=armv7-a
|
||||
ARMV := 7
|
||||
endif
|
||||
|
||||
DEFINES := -DCONFIG_ARMV$(ARMV) -DCONFIG_VDSO_32
|
||||
|
||||
PROTOUFIX := y
|
||||
# For simplicity - compile code in Arm mode without interwork.
|
||||
# We could choose Thumb mode as default instead - but a dirty
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue