summaryrefslogtreecommitdiffstats
path: root/arch/x86/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2023-02-15 10:16:56 +0100
committerIngo Molnar <mingo@kernel.org>2023-02-15 14:20:17 +0100
commitf9bb7f6a7eb0efd282f7364115f97e652677a29b (patch)
treeb985e7f4f9e266a0498480437d9efdc623bb7a98 /arch/x86/Makefile
parente1c04510f521e853019afeca2a5991a5ef8d6a5b (diff)
downloadlinux-stable-f9bb7f6a7eb0efd282f7364115f97e652677a29b.tar.gz
linux-stable-f9bb7f6a7eb0efd282f7364115f97e652677a29b.tar.bz2
linux-stable-f9bb7f6a7eb0efd282f7364115f97e652677a29b.zip
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 <arnd@arndb.de> Signed-off-by: Ingo Molnar <mingo@kernel.org> Link: https://lore.kernel.org/r/20230215091706.1623070-1-arnd@kernel.org
Diffstat (limited to 'arch/x86/Makefile')
-rw-r--r--arch/x86/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 73ed982d4100..b39975977c03 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -3,10 +3,10 @@
# select defconfig based on actual architecture
ifeq ($(ARCH),x86)
- ifeq ($(shell uname -m),x86_64)
- KBUILD_DEFCONFIG := x86_64_defconfig
- else
+ ifeq ($(shell uname -m | sed -e 's/i.86/i386/'),i386)
KBUILD_DEFCONFIG := i386_defconfig
+ else
+ KBUILD_DEFCONFIG := x86_64_defconfig
endif
else
KBUILD_DEFCONFIG := $(ARCH)_defconfig