[CRIU] [PATCH] zdtm: Use predefined macro from nmk
Cyrill Gorcunov
gorcunov at openvz.org
Fri Feb 26 08:47:44 PST 2016
We better should switch to nmk usage.
But lets c/p for now.
Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
test/zdtm/Makefile.inc | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index 51d2243c5d3d..074e39bd8d0d 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -1,22 +1,22 @@
-ARCH ?= $(shell uname -m | sed \
- -e s/i.86/i386/ \
- -e s/sun4u/sparc64/ \
- -e s/arm.*/arm/ \
- -e s/sa110/arm/ \
- -e s/s390x/s390/ \
- -e s/parisc64/parisc/ \
- -e s/mips.*/mips/ \
- -e s/sh[234].*/sh/)
+ARCH ?= $(shell uname -m | sed \
+ -e s/i.86/x86/ \
+ -e s/x86_64/x86/ \
+ -e s/sun4u/sparc64/ \
+ -e s/arm.*/arm/ \
+ -e s/sa110/arm/ \
+ -e s/s390x/s390/ \
+ -e s/parisc64/parisc/ \
+ -e s/ppc64.*/ppc64/ \
+ -e s/mips.*/mips/ \
+ -e s/sh[234].*/sh/ \
+ -e s/aarch64.*/arm64/)
-SRCARCH ?= $(ARCH)
-
-ifeq ($(ARCH),i386)
- SRCARCH := x86
+ifeq ($(ARCH),arm64)
+ ARCH ?= aarch64
+ SRCARCH ?= aarch64
endif
-ifeq ($(ARCH),x86_64)
- SRCARCH := x86
-endif
+SRCARCH ?= $(ARCH)
CPPFLAGS += -iquote $(LIBDIR)/arch/$(SRCARCH)/include
--
2.5.0
More information about the CRIU
mailing list