Commit 0af5cb34 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull Kbuild updates from Masahiro Yamada:

 - Remove the support for -O3 (CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3)

 - Fix error of rpm-pkg cross-builds

 - Support riscv for checkstack tool

 - Re-enable -Wformwat warnings for Clang

 - Clean up modpost, Makefiles, and misc scripts

* tag 'kbuild-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (30 commits)
  modpost: remove .symbol_white_list field entirely
  modpost: remove unneeded .symbol_white_list initializers
  modpost: add PATTERNS() helper macro
  modpost: shorten warning messages in report_sec_mismatch()
  Revert "Kbuild, lto, workaround: Don't warn for initcall_reference in modpost"
  modpost: use more reliable way to get fromsec in section_rel(a)()
  modpost: add array range check to sec_name()
  modpost: refactor get_secindex()
  kbuild: set EXIT trap before creating temporary directory
  modpost: remove unused Elf_Sword macro
  Makefile.extrawarn: re-enable -Wformat for clang
  kbuild: add dtbs_prepare target
  kconfig: Qt5: tell the user which packages are required
  modpost: use sym_get_data() to get module device_table data
  modpost: drop executable ELF support
  checkstack: add riscv support for scripts/checkstack.pl
  kconfig: shorten the temporary directory name for cc-option
  scripts: headers_install.sh: Update config leak ignore entries
  kbuild: error out if $(INSTALL_MOD_PATH) contains % or :
  kbuild: error out if $(KBUILD_EXTMOD) contains % or :
  ...
parents d4252071 672fb674

Documentation/kbuild/kconfig-language.rst

+1 −1
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ Future kconfig work 
Work on kconfig is welcomed on both areas of clarifying semantics and on

evaluating the use of a full SAT solver for it. A full SAT solver can be

desirable to enable more complex dependency mappings and / or queries,

for instance on possible use case for a SAT solver could be that of handling

for instance one possible use case for a SAT solver could be that of handling

the current known recursive dependency issues. It is not known if this would

address such issues but such evaluation is desirable. If support for a full SAT

solver proves too complex or that it cannot address recursive dependency issues

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -4783,7 +4783,6 @@ L: keyrings@vger.kernel.org 
S:	Maintained

F:	Documentation/admin-guide/module-signing.rst

F:	certs/

F:	scripts/check-blacklist-hashes.awk

F:	scripts/sign-file.c

F:	tools/certs/
































Makefile



+12
−6






























Original line number
Diff line number
Diff line







@@ -129,6 +129,9 @@ endif







$(if $(word 2, $(KBUILD_EXTMOD)), \









	$(error building multiple external modules is not supported))



















$(foreach x, % :, $(if $(findstring $x, $(KBUILD_EXTMOD)), \









	$(error module directory path cannot contain '$x')))



















# Remove trailing slashes









ifneq ($(filter %/, $(KBUILD_EXTMOD)),)









KBUILD_EXTMOD := $(shell dirname $(KBUILD_EXTMOD).)








@@ -755,8 +758,6 @@ KBUILD_CFLAGS	+= $(call cc-disable-warning, address-of-packed-member)

















ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE









KBUILD_CFLAGS += -O2









else ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3









KBUILD_CFLAGS += -O3









else ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE









KBUILD_CFLAGS += -Os









endif








@@ -1370,16 +1371,21 @@ endif

















ifneq ($(dtstree),)



















%.dtb: include/config/kernel.release scripts_dtc









%.dtb: dtbs_prepare









	$(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@



















%.dtbo: include/config/kernel.release scripts_dtc









%.dtbo: dtbs_prepare









	$(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@



















PHONY += dtbs dtbs_install dtbs_check









dtbs: include/config/kernel.release scripts_dtc









PHONY += dtbs dtbs_prepare dtbs_install dtbs_check









dtbs: dtbs_prepare









	$(Q)$(MAKE) $(build)=$(dtstree)



















# include/config/kernel.release is actually needed when installing DTBs because









# INSTALL_DTBS_PATH contains $(KERNELRELEASE). However, we do not want to make









# dtbs_install depend on it as dtbs_install may run as root.









dtbs_prepare: include/config/kernel.release scripts_dtc



















ifneq ($(filter dtbs_check, $(MAKECMDGOALS)),)









export CHECK_DTBS=y









dtbs: dt_binding_check
































arch/arc/configs/axs101_defconfig



+0
−1






























Original line number
Diff line number
Diff line







@@ -9,7 +9,6 @@ CONFIG_NAMESPACES=y







# CONFIG_UTS_NS is not set









# CONFIG_PID_NS is not set









CONFIG_BLK_DEV_INITRD=y









CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3=y









CONFIG_EMBEDDED=y









CONFIG_PERF_EVENTS=y









# CONFIG_VM_EVENT_COUNTERS is not set
































arch/arc/configs/axs103_defconfig



+0
−1






























Original line number
Diff line number
Diff line







@@ -9,7 +9,6 @@ CONFIG_NAMESPACES=y







# CONFIG_UTS_NS is not set









# CONFIG_PID_NS is not set









CONFIG_BLK_DEV_INITRD=y









CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3=y









CONFIG_EMBEDDED=y









CONFIG_PERF_EVENTS=y









# CONFIG_VM_EVENT_COUNTERS is not set