From: Linus Torvalds Date: Fri, 11 Nov 2005 22:27:32 +0000 (-0800) Subject: ppc64: default build as the merged 'powerpc' architecture X-Git-Tag: v2.6.15-rc1~6 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39990b5eb93c624abc345f81c30f1a9c7f2ec3f3;p=linux-2.6 ppc64: default build as the merged 'powerpc' architecture After the last merge of the new unified 'powerpc' architecture, ppc64 no longer compiles cleanly as a standalone architecture. Some bits and pieces still exist as files under the old ppc64 hierarchy, but the old "ARCH=ppc64" is dead. So if "uname" says ppc64, that now implies that the default architecture should be "powerpc". Acked-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds --- diff --git a/Makefile b/Makefile index 6d1f727f43..c041a4305c 100644 --- a/Makefile +++ b/Makefile @@ -168,7 +168,8 @@ KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)$(LOCALVERSION) SUBARCH := $(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/s390x/s390/ -e s/parisc64/parisc/ \ + -e s/ppc64/powerpc/ ) # Cross compiling and selecting different set of gcc/bin-utils # ---------------------------------------------------------------------------