Commit 572640f0 authored Feb 20, 2023 by Linus Torvalds

Merge tag 'x86-build-2023-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 build update from Ingo Molnar:
 "Make the 64-bit defconfig the x86 default for all builds, unless
  x86-32 is requested explicitly"

* tag 'x86-build-2023-02-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/build: Make 64-bit defconfig the default

parents 35011c67 f9bb7f6a

arch/x86/Makefile

+3 −3

Original line number	Diff line number	Diff line
		@@ -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