Skip to content

Commit f9bb7f6

Browse files
arndbIngo Molnar
authored andcommitted
x86/build: Make 64-bit defconfig the default
Running 'make ARCH=x86 defconfig' on anything other than an x86_64 machine currently results in a 32-bit build, which is rarely what anyone wants these days. Change the default so that the 64-bit config gets used unless the user asks for i386_defconfig, uses ARCH=i386 or runs on a system that "uname -m" identifies as i386/i486/i586/i686. Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent e1c0451 commit f9bb7f6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arch/x86/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
# select defconfig based on actual architecture
55
ifeq ($(ARCH),x86)
6-
ifeq ($(shell uname -m),x86_64)
7-
KBUILD_DEFCONFIG := x86_64_defconfig
8-
else
6+
ifeq ($(shell uname -m | sed -e 's/i.86/i386/'),i386)
97
KBUILD_DEFCONFIG := i386_defconfig
8+
else
9+
KBUILD_DEFCONFIG := x86_64_defconfig
1010
endif
1111
else
1212
KBUILD_DEFCONFIG := $(ARCH)_defconfig

0 commit comments

Comments
 (0)