[CRIU] [PATCH] build: simplify ppc64 builds

[Laurent Dufour]

Since the move to nmk, zdtm failed to build on ppc64 because ARCH is
computed in the nmk and set to powerpc.
In fact it seems more efficient to set it to ppc64 when this is ppc64
or ppc64le since these 2 architecture should be handled the same way.

Doing this fixes the zdtm build issue and simplify a bit the others
makefiles.

Cc: Cyrill Gorcunov <gorcunov at gmail.com>
Signed-off-by: Laurent Dufour <ldufour at linux.vnet.ibm.com>
---
 Makefile                       |  2 +-
 criu/Makefile                  |  3 +--
 scripts/nmk/scripts/include.mk |  2 +-
 test/zdtm/Makefile.inc         | 11 -----------
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 6ebd72fa621f..4f3bf3fdc749 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ endif
 # The PowerPC 64 bits architecture could be big or little endian.
 # They are handled in the same way.
 #
-ifeq ($(ARCH),powerpc)
+ifeq ($(ARCH),ppc64)
         ifeq ($(UNAME-M),ppc64)
                 error := $(error ppc64 big endian not yet supported)
         endif
diff --git a/criu/Makefile b/criu/Makefile
index cc35f3771f88..9190b1108c11 100644
--- a/criu/Makefile
+++ b/criu/Makefile
@@ -24,8 +24,7 @@ ifeq ($(ARCH),arm64)
         VDSO		:= y
 endif
 
-ifeq ($(ARCH),powerpc)
-        ARCH		:= ppc64
+ifeq ($(ARCH),ppc64)
         SRCARCH		:= ppc64
         LDARCH		:= powerpc:common64
         VDSO		:= y
diff --git a/scripts/nmk/scripts/include.mk b/scripts/nmk/scripts/include.mk
index c7dd7ccfb829..1ffd95e26d7d 100644
--- a/scripts/nmk/scripts/include.mk
+++ b/scripts/nmk/scripts/include.mk
@@ -14,7 +14,7 @@ SUBARCH := $(shell uname -m | sed       \
                 -e s/sa110/arm/         \
                 -e s/s390x/s390/        \
                 -e s/parisc64/parisc/   \
-                -e s/ppc.*/powerpc/     \
+		-e s/ppc64.*/ppc64/	\
                 -e s/mips.*/mips/       \
                 -e s/sh[234].*/sh/      \
                 -e s/aarch64.*/arm64/)
diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index 5e0d4200b885..51d2243c5d3d 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -18,17 +18,6 @@ ifeq ($(ARCH),x86_64)
 	SRCARCH := x86
 endif
 
-#
-# The PowerPC 64 bits architecture could be big or little endian.
-# They are handled in the same way.
-#
-ifeq ($(shell echo $(ARCH) | sed -e 's/ppc64.*/ppc64/'),ppc64)
-	ifeq ($(ARCH),ppc64)
-		error	:= $(error ppc64 big endian not yet supported)
-	endif
-	SRCARCH	:= ppc64
-endif
-
 CPPFLAGS += -iquote $(LIBDIR)/arch/$(SRCARCH)/include
 
 ifeq ($(strip $(V)),)
-- 
1.9.1