[CRIU] [PATCH 2/2] build: Use ppc64 for PowerPC 64 bits architecture

Laurent Dufour ldufour at linux.vnet.ibm.com
Wed Feb 24 08:21:31 PST 2016


The nmk framework now references PowerPC 64 bits architectures as
ppc64. This applies for both little endian, and the future supported
big endian one.

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

diff --git a/Makefile b/Makefile
index 33f7b0442652..c9f9f07ea3e6 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,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/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



More information about the CRIU mailing list