kbuild: set y instead of 1 to KBUILD_{BUILTIN,MODULES}
Subsystems (23)
PATCH 1/2 kbuild: set y instead of 1 to KBUILD_{BUILTIN,MODULES}
KBUILD_BUILTIN is set to 1 unless you are building only modules.
KBUILT_MODULES is set to 1 when you are building only modules (a typical use case is "make modules").
It is more useful to set them to 'y' instead, so we can do something like:
always-$(KBUILD_BUILTIN) += vmlinux.lds
This works equivalently to:
extra-y += vmlinux.lds
This allows us to deprecate extra-y. extra-y and always-y are quite similar, and we do not need both.
---
Documentation/kbuild/makefiles.rst | 8 ++++++-- Makefile | 16 ++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-)
Documentation/kbuild/makefiles.rst +6 -2
@@ -273,8 +273,8 @@ It is good practice to use a ``CONFIG_`` variable when assigning directory names. This allows kbuild to totally skip the directory if the corresponding ``CONFIG_`` option is neither "y" nor "m". -Non-builtin vmlinux targets - extra-y -------------------------------------- +Non-builtin vmlinux targets - extra-y (DEPRECATED) +-------------------------------------------------- extra-y specifies targets which are needed for building vmlinux, but not combined into built-in.a.
@@ -291,6 +291,10 @@ Example:: # arch/x86/kernel/Makefile extra-y += vmlinux.lds +extra-y is now deprecated because this is equivalent to: + + always-$(KBUILD_BUILTIN) += vmlinux.lds + $(extra-y) should only contain targets needed for vmlinux. Kbuild skips extra-y when vmlinux is apparently not a final goal.
Makefile +8 -8
@@ -749,7 +749,7 @@ targets := # Normally, just do built-in. KBUILD_MODULES := -KBUILD_BUILTIN := 1 +KBUILD_BUILTIN := y # If we have only "make modules", don't compile built-in objects. ifeq ($(MAKECMDGOALS),modules)
@@ -761,11 +761,11 @@ endif # Just "make" or "make all" shall build modules as well ifneq ($(filter all modules nsdeps compile_commands.json clang-%,$(MAKECMDGOALS)),) - KBUILD_MODULES := 1 + KBUILD_MODULES := y endif ifeq ($(MAKECMDGOALS),) - KBUILD_MODULES := 1 + KBUILD_MODULES := y endif export KBUILD_MODULES KBUILD_BUILTIN
@@ -1193,7 +1193,7 @@ export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds ifdef CONFIG_TRIM_UNUSED_KSYMS # For the kernel to actually contain only the needed exported symbols, # we have to build modules as well to determine what those symbols are. -KBUILD_MODULES := 1 +KBUILD_MODULES := y endif PHONY += vmlinux_a
@@ -1529,7 +1529,7 @@ all: modules # the built-in objects during the descend as well, in order to # make sure the checksums are up to date before we record them. ifdef CONFIG_MODVERSIONS - KBUILD_BUILTIN := 1 + KBUILD_BUILTIN := y endif # Build modules
@@ -1538,7 +1538,7 @@ endif # *.ko are usually independent of vmlinux, but CONFIG_DEBUG_INFO_BTF_MODULES # is an exception. ifdef CONFIG_DEBUG_INFO_BTF_MODULES -KBUILD_BUILTIN := 1 +KBUILD_BUILTIN := y modules: vmlinux endif
@@ -1855,7 +1855,7 @@ filechk_kernel.release = echo $(KERNELRELEASE) # We are always building only modules. KBUILD_BUILTIN := -KBUILD_MODULES := 1 +KBUILD_MODULES := y build-dir := .
@@ -1983,7 +1983,7 @@ endif single-goals := $(addprefix $(build-dir)/, $(single-no-ko)) -KBUILD_MODULES := 1 +KBUILD_MODULES := y endif
Signature · 1 line
2.43.0
PATCH 2/2 arch: use always-$(KBUILD_BUILTIN) for vmlinux.lds
The extra-y syntax is deprecated. Instead, use always-$(KBUILD_BUILTIN), which behaves equivalently.
---
arch/alpha/kernel/Makefile | 2 +- arch/arc/kernel/Makefile | 2 +- arch/arm/kernel/Makefile | 2 +- arch/arm64/kernel/Makefile | 2 +- arch/csky/kernel/Makefile | 2 +- arch/hexagon/kernel/Makefile | 2 +- arch/loongarch/kernel/Makefile | 2 +- arch/m68k/kernel/Makefile | 2 +- arch/microblaze/kernel/Makefile | 2 +- arch/mips/kernel/Makefile | 2 +- arch/nios2/kernel/Makefile | 2 +- arch/openrisc/kernel/Makefile | 2 +- arch/parisc/kernel/Makefile | 2 +- arch/powerpc/kernel/Makefile | 2 +- arch/riscv/kernel/Makefile | 2 +- arch/s390/kernel/Makefile | 2 +- arch/sh/kernel/Makefile | 2 +- arch/sparc/kernel/Makefile | 2 +- arch/um/kernel/Makefile | 2 +- arch/x86/kernel/Makefile | 2 +- arch/xtensa/kernel/Makefile | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-)
arch/alpha/kernel/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for the linux kernel. # -extra-y := vmlinux.lds +always-$(KBUILD_BUILTIN) := vmlinux.lds asflags-y := $(KBUILD_CFLAGS) ccflags-y := -Wno-sign-compare
arch/arc/kernel/Makefile +1 -1
@@ -26,4 +26,4 @@ ifdef CONFIG_ISA_ARCOMPACT CFLAGS_fpu.o += -mdpfp endif -extra-y := vmlinux.lds +always-$(KBUILD_BUILTIN) := vmlinux.lds
arch/arm/kernel/Makefile +1 -1
@@ -104,4 +104,4 @@ obj-$(CONFIG_HAVE_ARM_SMCCC) += smccc-call.o obj-$(CONFIG_GENERIC_CPU_VULNERABILITIES) += spectre.o -extra-y := vmlinux.lds +always-$(KBUILD_BUILTIN) := vmlinux.lds
arch/arm64/kernel/Makefile +1 -1
@@ -78,7 +78,7 @@ $(obj)/vdso32-wrap.o: $(obj)/vdso32/vdso.so obj-y += probes/ obj-y += head.o -extra-y += vmlinux.lds +always-$(KBUILD_BUILTIN) += vmlinux.lds ifeq ($(CONFIG_DEBUG_EFI),y) AFLAGS_head.o += -DVMLINUX_PATH="\"$(realpath $(objtree)/vmlinux)\""
arch/csky/kernel/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -extra-y := vmlinux.lds +always-$(KBUILD_BUILTIN) := vmlinux.lds obj-y += head.o entry.o atomic.o signal.o traps.o irq.o time.o vdso.o vdso/ obj-y += power.o syscall.o syscall_table.o setup.o
arch/hexagon/kernel/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -extra-y := vmlinux.lds +always-$(KBUILD_BUILTIN) := vmlinux.lds obj-y += head.o obj-$(CONFIG_SMP) += smp.o
arch/loongarch/kernel/Makefile +1 -1
@@ -5,7 +5,7 @@ OBJECT_FILES_NON_STANDARD_head.o := y -extra-y := vmlinux.lds +always-$(KBUILD_BUILTIN) := vmlinux.lds obj-y += head.o cpu-probe.o cacheinfo.o env.o setup.o entry.o genex.o \ traps.o irq.o idle.o process.o dma.o mem.o reset.o switch.o \
arch/m68k/kernel/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for the linux kernel. # -extra-y += vmlinux.lds +always-$(KBUILD_BUILTIN) += vmlinux.lds obj-$(CONFIG_MMU_MOTOROLA) := head.o obj-$(CONFIG_SUN3) := sun3-head.o
arch/microblaze/kernel/Makefile +1 -1
@@ -11,7 +11,7 @@ CFLAGS_REMOVE_ftrace.o = -pg CFLAGS_REMOVE_process.o = -pg endif -extra-y := vmlinux.lds +always-$(KBUILD_BUILTIN) := vmlinux.lds obj-y += head.o dma.o exceptions.o \ hw_exception_handler.o irq.o \
arch/mips/kernel/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for the Linux/MIPS kernel. # -extra-y := vmlinux.lds +always-$(KBUILD_BUILTIN) := vmlinux.lds obj-y += head.o branch.o cmpxchg.o elf.o entry.o genex.o idle.o irq.o \ process.o prom.o ptrace.o reset.o setup.o signal.o \
arch/nios2/kernel/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for the nios2 linux kernel. # -extra-y += vmlinux.lds +always-$(KBUILD_BUILTIN) += vmlinux.lds obj-y += head.o obj-y += cpuinfo.o
arch/openrisc/kernel/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for the linux kernel. # -extra-y := vmlinux.lds +always-$(KBUILD_BUILTIN) := vmlinux.lds obj-y := head.o setup.o or32_ksyms.o process.o dma.o \ traps.o time.o irq.o entry.o ptrace.o signal.o \
arch/parisc/kernel/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for arch/parisc/kernel # -extra-y := vmlinux.lds +always-$(KBUILD_BUILTIN) := vmlinux.lds obj-y := head.o cache.o pacache.o setup.o pdt.o traps.o time.o irq.o \ syscall.o entry.o sys_parisc.o firmware.o \
arch/powerpc/kernel/Makefile +1 -1
@@ -126,7 +126,7 @@ obj-$(CONFIG_PPC_BOOK3S_32) += head_book3s_32.o obj-$(CONFIG_44x) += head_44x.o obj-$(CONFIG_PPC_8xx) += head_8xx.o obj-$(CONFIG_PPC_85xx) += head_85xx.o -extra-y += vmlinux.lds +always-$(KBUILD_BUILTIN) += vmlinux.lds obj-$(CONFIG_RELOCATABLE) += reloc_$(BITS).o
arch/riscv/kernel/Makefile +1 -1
@@ -43,7 +43,7 @@ CFLAGS_sbi_ecall.o += -D__NO_FORTIFY endif endif -extra-y += vmlinux.lds +always-$(KBUILD_BUILTIN) += vmlinux.lds obj-y += head.o obj-y += soc.o
arch/s390/kernel/Makefile +1 -1
@@ -46,7 +46,7 @@ obj-y += nospec-branch.o ipl_vmparm.o machine_kexec_reloc.o unwind_bc.o obj-y += smp.o text_amode31.o stacktrace.o abs_lowcore.o facility.o uv.o wti.o obj-y += diag/ -extra-y += vmlinux.lds +always-$(KBUILD_BUILTIN) += vmlinux.lds obj-$(CONFIG_SYSFS) += nospec-sysfs.o CFLAGS_REMOVE_nospec-branch.o += $(CC_FLAGS_EXPOLINE)
arch/sh/kernel/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for the Linux/SuperH kernel. # -extra-y := vmlinux.lds +always-$(KBUILD_BUILTIN) := vmlinux.lds ifdef CONFIG_FUNCTION_TRACER # Do not profile debug and lowlevel utilities
arch/sparc/kernel/Makefile +1 -1
@@ -9,7 +9,7 @@ asflags-y := -ansi # Undefine sparc when processing vmlinux.lds - it is used # And teach CPP we are doing $(BITS) builds (for this case) CPPFLAGS_vmlinux.lds := -Usparc -m$(BITS) -extra-y += vmlinux.lds +always-$(KBUILD_BUILTIN) += vmlinux.lds ifdef CONFIG_FUNCTION_TRACER # Do not profile debug and lowlevel utilities
arch/um/kernel/Makefile +1 -1
@@ -12,7 +12,7 @@ CPPFLAGS_vmlinux.lds := -DSTART=$(LDS_START) \ -DELF_ARCH=$(LDS_ELF_ARCH) \ -DELF_FORMAT=$(LDS_ELF_FORMAT) \ $(LDS_EXTRA) -extra-y := vmlinux.lds +always-$(KBUILD_BUILTIN) := vmlinux.lds obj-y = config.o exec.o exitcode.o irq.o ksyms.o mem.o \ physmem.o process.o ptrace.o reboot.o sigio.o \
arch/x86/kernel/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for the linux kernel. # -extra-y += vmlinux.lds +always-$(KBUILD_BUILTIN) += vmlinux.lds CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE)
arch/xtensa/kernel/Makefile +1 -1
@@ -3,7 +3,7 @@ # Makefile for the Linux/Xtensa kernel. # -extra-y := vmlinux.lds +always-$(KBUILD_BUILTIN) := vmlinux.lds obj-y := head.o align.o coprocessor.o entry.o irq.o platform.o process.o \ ptrace.o setup.o signal.o stacktrace.o syscall.o time.o traps.o \
Signature · 1 line
2.43.0
Re: [PATCH 2/2] arch: use always-$(KBUILD_BUILTIN) for vmlinux.lds
Quoted 2 lines · Masahiro Yamada
The extra-y syntax is deprecated. Instead, use always-$(KBUILD_BUILTIN), which behaves equivalently.
OK, whatever you say ;-)
Quoted 1 line
arch/um/kernel/Makefile | 2 +-
johannes
Re: [PATCH 2/2] arch: use always-$(KBUILD_BUILTIN) for vmlinux.lds
In reply to Masahiro YamadaQuoted 20 lines · Masahiro Yamada
The extra-y syntax is deprecated. Instead, use always-$(KBUILD_BUILTIN), which behaves equivalently.
Signed-off-by Masahiro Yamada <[email protected]>---
arch/alpha/kernel/Makefile | 2 +- arch/arc/kernel/Makefile | 2 +- arch/arm/kernel/Makefile | 2 +- arch/arm64/kernel/Makefile | 2 +- arch/csky/kernel/Makefile | 2 +- arch/hexagon/kernel/Makefile | 2 +- arch/loongarch/kernel/Makefile | 2 +- arch/m68k/kernel/Makefile | 2 +- arch/microblaze/kernel/Makefile | 2 +- arch/mips/kernel/Makefile | 2 +- arch/nios2/kernel/Makefile | 2 +- arch/openrisc/kernel/Makefile | 2 +- arch/parisc/kernel/Makefile | 2 +- arch/powerpc/kernel/Makefile | 2 +-
Quoted 9 lines
arch/riscv/kernel/Makefile | 2 +- arch/s390/kernel/Makefile | 2 +- arch/sh/kernel/Makefile | 2 +- arch/sparc/kernel/Makefile | 2 +- arch/um/kernel/Makefile | 2 +- arch/x86/kernel/Makefile | 2 +- arch/xtensa/kernel/Makefile | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-)
Re: [PATCH 2/2] arch: use always-$(KBUILD_BUILTIN) for vmlinux.lds
In reply to Masahiro YamadaThis patch was applied to riscv/linux.git (fixes) by Masahiro Yamada <[email protected]>:
Hello:
This patch was applied to riscv/linux.git (fixes)
by Masahiro Yamada <[email protected]>:
Quoted 20 lines · On Tue, 3 Jun 2025 03:12:54 +0900 you wrote:
The extra-y syntax is deprecated. Instead, use always-$(KBUILD_BUILTIN), which behaves equivalently.
Signed-off-by Masahiro Yamada <[email protected]>---
arch/alpha/kernel/Makefile | 2 +- arch/arc/kernel/Makefile | 2 +- arch/arm/kernel/Makefile | 2 +- arch/arm64/kernel/Makefile | 2 +- arch/csky/kernel/Makefile | 2 +- arch/hexagon/kernel/Makefile | 2 +- arch/loongarch/kernel/Makefile | 2 +- arch/m68k/kernel/Makefile | 2 +- arch/microblaze/kernel/Makefile | 2 +- arch/mips/kernel/Makefile | 2 +- arch/nios2/kernel/Makefile | 2 +- arch/openrisc/kernel/Makefile | 2 +- arch/parisc/kernel/Makefile | 2 +- arch/powerpc/kernel/Makefile | 2 +-
Quoted 8 lines
arch/riscv/kernel/Makefile | 2 +- arch/s390/kernel/Makefile | 2 +- arch/sh/kernel/Makefile | 2 +- arch/sparc/kernel/Makefile | 2 +- arch/um/kernel/Makefile | 2 +- arch/x86/kernel/Makefile | 2 +- arch/xtensa/kernel/Makefile | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-)
Here is the summary with links:
- [2/2] arch: use always-$(KBUILD_BUILTIN) for vmlinux.lds
https://git.kernel.org/riscv/c/e21efe833eae
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Quoted 10 lines · Masahiro Yamada
KBUILD_BUILTINis set to 1 unless you are building only modules.
KBUILT_MODULESis set to 1 when you are building only modules (a typical use case is "make modules").It is more useful to set them to 'y' instead, so we can do something like:
always-$(KBUILD_BUILTIN) += vmlinux.lds
Quoted 8 lines
This works equivalently to:
extra-y += vmlinux.ldsThis allows us to deprecate extra-y. extra-y and always-y are quite similar, and we do not need both.
Signed-off-by Masahiro Yamada <[email protected]>
Quoted 107 lines
---
Documentation/kbuild/makefiles.rst | 8 ++++++-- Makefile | 16 ++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-)Documentation/kbuild/makefiles.rst +6
-2@@ -273,8 +273,8 @@ It is good practice to use a ``CONFIG_`` variable when assigning directory names. This allows kbuild to totally skip the directory if the corresponding ``CONFIG_`` option is neither "y" nor "m". -Non-builtin vmlinux targets - extra-y -------------------------------------- +Non-builtin vmlinux targets - extra-y (DEPRECATED) +-------------------------------------------------- extra-y specifies targets which are needed for building vmlinux, but not combined into built-in.a.@@ -291,6 +291,10 @@ Example:: # arch/x86/kernel/Makefile extra-y += vmlinux.lds +extra-y is now deprecated because this is equivalent to: + + always-$(KBUILD_BUILTIN) += vmlinux.lds + $(extra-y) should only contain targets needed for vmlinux. Kbuild skips extra-y when vmlinux is apparently not a final goal.Makefile +8
-8@@ -749,7 +749,7 @@ targets := # Normally, just do built-in. KBUILD_MODULES := -KBUILD_BUILTIN := 1 +KBUILD_BUILTIN := y # If we have only "make modules", don't compile built-in objects. ifeq ($(MAKECMDGOALS),modules)@@ -761,11 +761,11 @@ endif # Just "make" or "make all" shall build modules as well ifneq ($(filter all modules nsdeps compile_commands.json clang-%,$(MAKECMDGOALS)),) - KBUILD_MODULES := 1 + KBUILD_MODULES := y endif ifeq ($(MAKECMDGOALS),) - KBUILD_MODULES := 1 + KBUILD_MODULES := y endif export KBUILD_MODULES KBUILD_BUILTIN@@ -1193,7 +1193,7 @@ export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds ifdef CONFIG_TRIM_UNUSED_KSYMS # For the kernel to actually contain only the needed exported symbols, # we have to build modules as well to determine what those symbols are. -KBUILD_MODULES := 1 +KBUILD_MODULES := y endif PHONY += vmlinux_a@@ -1529,7 +1529,7 @@ all: modules # the built-in objects during the descend as well, in order to # make sure the checksums are up to date before we record them. ifdef CONFIG_MODVERSIONS - KBUILD_BUILTIN := 1 + KBUILD_BUILTIN := y endif # Build modules@@ -1538,7 +1538,7 @@ endif # *.ko are usually independent of vmlinux, but CONFIG_DEBUG_INFO_BTF_MODULES # is an exception. ifdef CONFIG_DEBUG_INFO_BTF_MODULES -KBUILD_BUILTIN := 1 +KBUILD_BUILTIN := y modules: vmlinux endif@@ -1855,7 +1855,7 @@ filechk_kernel.release = echo $(KERNELRELEASE) # We are always building only modules. KBUILD_BUILTIN := -KBUILD_MODULES := 1 +KBUILD_MODULES := y build-dir := .@@ -1983,7 +1983,7 @@ endif single-goals := $(addprefix $(build-dir)/, $(single-no-ko)) -KBUILD_MODULES := 1 +KBUILD_MODULES := y endifSignature · 1 line
2.43.0
Quoted 3 lines · Masahiro Yamada
KBUILD_BUILTINis set to 1 unless you are building only modules.
KBUILT_MODULESis set to 1 when you are building only modules
T -> D: KBUILD_MODULES