diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 23:27:32 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 23:27:32 +0100 |
| commit | 39990b5eb93c624abc345f81c30f1a9c7f2ec3f3 (patch) | |
| tree | 7b8eda9a6c26e2f0dc3dbca5ea20417c920bf598 /Makefile | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6 (diff) | |
| download | linux-39990b5eb93c624abc345f81c30f1a9c7f2ec3f3.tar.xz linux-39990b5eb93c624abc345f81c30f1a9c7f2ec3f3.zip | |
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 <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to '')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 # --------------------------------------------------------------------------- |