path: root/Makefile
diff options
authorLinus Torvalds <>2013-02-19 19:12:03 -0800
committerLinus Torvalds <>2013-02-19 19:12:03 -0800
commit121027a7a64a12e9e5c0289f12473ff11678a812 (patch)
tree741dd57ee06d9607d9126a7ae9014cd087e54d32 /Makefile
parent5abcd76f5d896de014bd8d1486107c483659d40d (diff)
parent63a3f603413ffe82ad775f2d62a5afff87fd94a0 (diff)
Merge branch 'x86-build-for-linus' of git://
Pull two x86 kernel build changes from Ingo Molnar: "The first change modifies how 'make oldconfig' works on cross-bitness situations on x86. It was felt the new behavior of preserving the bitness of the .config is more logical. This is a leftover of the merge. The second change eliminates a Perl warning. (There's another, more complete fix resulting of this warning fix, which second fix in flight to you via the kbuild tree, which will remove the script altogether.)" * 'x86-build-for-linus' of git:// Eliminate Perl warning x86: Default to ARCH=x86 to avoid overriding CONFIG_64BIT
Diffstat (limited to 'Makefile')
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d69266c4069..6fccf653177 100644
--- a/Makefile
+++ b/Makefile
@@ -165,7 +165,8 @@ export srctree objtree VPATH
# then ARCH is assigned, getting whatever value it gets normally, and
# SUBARCH is subsequently ignored.
-SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
+SUBARCH := $(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/ppc.*/powerpc/ -e s/mips.*/mips/ \