diff mbox series

x86: make 64-bit defconfig the default

Message ID 20230215091706.1623070-1-arnd@kernel.org
State New
Headers
Series x86: make 64-bit defconfig the default |

Commit Message

Arnd Bergmann Feb. 15, 2023, 9:16 a.m. UTC 
  From: Arnd Bergmann <arnd@arndb.de>

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>
---
 arch/x86/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Masahiro Yamada Feb. 15, 2023, 4:54 p.m. UTC | #1 
On Wed, Feb 15, 2023 at 6:17 PM Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> 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>
> ---
>  arch/x86/Makefile | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/Makefile b/arch/x86/Makefile
> index a27b27d1418d..cc7efb6e6e6b 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)


I did not test this, but I think

     ifneq ($(shell uname -m | grep 'i.86'),)

is simpler.




     ifneq ($(filter i%86, $(shell uname -m)),)


will also work with less process forks.






>          KBUILD_DEFCONFIG := i386_defconfig
> +  else
> +        KBUILD_DEFCONFIG := x86_64_defconfig
>    endif
>  else
>          KBUILD_DEFCONFIG := $(ARCH)_defconfig
> --
> 2.39.1
>
diff mbox series

Patch

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index a27b27d1418d..cc7efb6e6e6b 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