Commit 6feb57c2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild 

Pull Kbuild updates from Masahiro Yamada:

 - Support zstd-compressed debug info

 - Allow W=1 builds to detect objects shared among multiple modules

 - Add srcrpm-pkg target to generate a source RPM package

 - Make the -s option detection work for future GNU Make versions

 - Add -Werror to KBUILD_CPPFLAGS when CONFIG_WERROR=y

 - Allow W=1 builds to detect -Wundef warnings in any preprocessed files

 - Raise the minimum supported version of binutils to 2.25

 - Use $(intcmp ...) to compare integers if GNU Make >= 4.4 is used

 - Use $(file ...) to read a file if GNU Make >= 4.2 is used

 - Print error if GNU Make older than 3.82 is used

 - Allow modpost to detect section mismatches with Clang LTO

 - Include vmlinuz.efi into kernel tarballs for arm64 CONFIG_EFI_ZBOOT=y

* tag 'kbuild-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (29 commits)
  buildtar: fix tarballs with EFI_ZBOOT enabled
  modpost: Include '.text.*' in TEXT_SECTIONS
  padata: Mark padata_work_init() as __ref
  kbuild: ensure Make >= 3.82 is used
  kbuild: refactor the prerequisites of the modpost rule
  kbuild: change module.order to list *.o instead of *.ko
  kbuild: use .NOTINTERMEDIATE for future GNU Make versions
  kconfig: refactor Makefile to reduce process forks
  kbuild: add read-file macro
  kbuild: do not sort after reading modules.order
  kbuild: add test-{ge,gt,le,lt} macros
  Documentation: raise minimum supported version of binutils to 2.25
  kbuild: add -Wundef to KBUILD_CPPFLAGS for W=1 builds
  kbuild: move -Werror from KBUILD_CFLAGS to KBUILD_CPPFLAGS
  kbuild: Port silent mode detection to future gnu make.
  init/version.c: remove #include <generated/utsrelease.h>
  firmware_loader: remove #include <generated/utsrelease.h>
  modpost: Mark uuid_le type to be suitable only for MEI
  kbuild: add ability to make source rpm buildable using koji
  kbuild: warn objects shared among multiple modules
  ...
parents 158738ea 731c4eac

Documentation/process/changes.rst

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ Rust (optional) 1.62.0 rustc --version 
bindgen (optional)     0.56.0           bindgen --version

GNU make               3.82             make --version

bash                   4.2              bash --version

binutils               2.23             ld -v

binutils               2.25             ld -v

flex                   2.5.35           flex --version

bison                  2.0              bison --version

pahole                 1.16             pahole --version
@@ -119,7 +119,7 @@ Bash 4.2 or newer is needed. 
Binutils

--------



Binutils 2.23 or newer is needed to build the kernel.

Binutils 2.25 or newer is needed to build the kernel.



pkg-config

----------

Makefile

+19 −7
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ NAME = Hurr durr I'ma ninja sloth 
# Comments in this file are targeted only to the developer, do not

# expect to learn how to build the kernel reading this file.



ifeq ($(filter undefine,$(.FEATURES)),)

$(error GNU Make >= 3.82 is required. Your Make version is $(MAKE_VERSION))

endif



$(if $(filter __%, $(MAKECMDGOALS)), \

	$(error targets prefixed with '__' are only for internal use))
@@ -93,8 +97,15 @@ endif 


# If the user is running make -s (silent mode), suppress echoing of

# commands

# make-4.0 (and later) keep single letter options in the 1st word of MAKEFLAGS.



ifeq ($(filter 3.%,$(MAKE_VERSION)),)

silence:=$(findstring s,$(firstword -$(MAKEFLAGS)))

else

silence:=$(findstring s,$(filter-out --%,$(MAKEFLAGS)))

endif



ifneq ($(findstring s,$(filter-out --%,$(MAKEFLAGS))),)

ifeq ($(silence),s)

quiet=silent_

KBUILD_VERBOSE = 0

endif
@@ -369,7 +380,7 @@ else # !mixed-build 
include $(srctree)/scripts/Kbuild.include



# Read KERNELRELEASE from include/config/kernel.release (if it exists)

KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)

KERNELRELEASE = $(call read-file, include/config/kernel.release)

KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)

export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
@@ -859,7 +870,8 @@ stackp-flags-$(CONFIG_STACKPROTECTOR_STRONG) := -fstack-protector-strong 


KBUILD_CFLAGS += $(stackp-flags-y)



KBUILD_CFLAGS-$(CONFIG_WERROR) += -Werror

KBUILD_CPPFLAGS-$(CONFIG_WERROR) += -Werror

KBUILD_CPPFLAGS += $(KBUILD_CPPFLAGS-y)

KBUILD_CFLAGS-$(CONFIG_CC_NO_ARRAY_BOUNDS) += -Wno-array-bounds



KBUILD_RUSTFLAGS-$(CONFIG_WERROR) += -Dwarnings
@@ -990,7 +1002,7 @@ KBUILD_LDFLAGS += -mllvm -import-instr-limit=5 
# Check for frame size exceeding threshold during prolog/epilog insertion

# when using lld < 13.0.0.

ifneq ($(CONFIG_FRAME_WARN),0)

ifeq ($(shell test $(CONFIG_LLD_VERSION) -lt 130000; echo $$?),0)

ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 130000),y)

KBUILD_LDFLAGS	+= -plugin-opt=-warn-stack-size=$(CONFIG_FRAME_WARN)

endif

endif
@@ -1560,7 +1572,7 @@ __modinst_pre: 
		rm -f $(MODLIB)/build ; \

		ln -s $(CURDIR) $(MODLIB)/build ; \

	fi

	@sed 's:^:kernel/:' modules.order > $(MODLIB)/modules.order

	@sed 's:^\(.*\)\.o$$:kernel/\1.ko:' modules.order > $(MODLIB)/modules.order

	@cp -f modules.builtin $(MODLIB)/

	@cp -f $(objtree)/modules.builtin.modinfo $(MODLIB)/

arch/riscv/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ else 
endif



ifeq ($(CONFIG_LD_IS_LLD),y)

ifeq ($(shell test $(CONFIG_LLD_VERSION) -lt 150000; echo $$?),0)

ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 150000),y)

	KBUILD_CFLAGS += -mno-relax

	KBUILD_AFLAGS += -mno-relax

ifndef CONFIG_AS_IS_LLVM

arch/x86/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ endif 
KBUILD_LDFLAGS += -m elf_$(UTS_MACHINE)



ifdef CONFIG_LTO_CLANG

ifeq ($(shell test $(CONFIG_LLD_VERSION) -lt 130000; echo $$?),0)

ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 130000),y)

KBUILD_LDFLAGS	+= -plugin-opt=-stack-alignment=$(if $(CONFIG_X86_32),4,8)

endif

endif

drivers/base/firmware_loader/firmware.h

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ 
#include <linux/list.h>

#include <linux/completion.h>



#include <generated/utsrelease.h>



/**

 * enum fw_opt - options to control firmware loading behaviour

 *