Commit 746b25b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull Kbuild updates from Masahiro Yamada:

 - Support 'make compile_commands.json' to generate the compilation
   database more easily, avoiding stale entries

 - Support 'make clang-analyzer' and 'make clang-tidy' for static checks
   using clang-tidy

 - Preprocess scripts/modules.lds.S to allow CONFIG options in the
   module linker script

 - Drop cc-option tests from compiler flags supported by our minimal
   GCC/Clang versions

 - Use always 12-digits commit hash for CONFIG_LOCALVERSION_AUTO=y

 - Use sha1 build id for both BFD linker and LLD

 - Improve deb-pkg for reproducible builds and rootless builds

 - Remove stale, useless scripts/namespace.pl

 - Turn -Wreturn-type warning into error

 - Fix build error of deb-pkg when CONFIG_MODULES=n

 - Replace 'hostname' command with more portable 'uname -n'

 - Various Makefile cleanups

* tag 'kbuild-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (34 commits)
  kbuild: Use uname for LINUX_COMPILE_HOST detection
  kbuild: Only add -fno-var-tracking-assignments for old GCC versions
  kbuild: remove leftover comment for filechk utility
  treewide: remove DISABLE_LTO
  kbuild: deb-pkg: clean up package name variables
  kbuild: deb-pkg: do not build linux-headers package if CONFIG_MODULES=n
  kbuild: enforce -Werror=return-type
  scripts: remove namespace.pl
  builddeb: Add support for all required debian/rules targets
  builddeb: Enable rootless builds
  builddeb: Pass -n to gzip for reproducible packages
  kbuild: split the build log of kallsyms
  kbuild: explicitly specify the build id style
  scripts/setlocalversion: make git describe output more reliable
  kbuild: remove cc-option test of -Werror=date-time
  kbuild: remove cc-option test of -fno-stack-check
  kbuild: remove cc-option test of -fno-strict-overflow
  kbuild: move CFLAGS_{KASAN,UBSAN,KCSAN} exports to relevant Makefiles
  kbuild: remove redundant CONFIG_KASAN check from scripts/Makefile.kasan
  kbuild: do not create built-in objects for external module builds
  ...
parents 2b714820 1e66d50a

Documentation/process/submit-checklist.rst

+1 −2
Original line number Diff line number Diff line
@@ -53,8 +53,7 @@ and elsewhere regarding submitting Linux kernel patches. 


9) Check cleanly with sparse.



10) Use ``make checkstack`` and ``make namespacecheck`` and fix any problems

    that they find.

10) Use ``make checkstack`` and fix any problems that it finds.



    .. note::

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4273,6 +4273,7 @@ W: https://clangbuiltlinux.github.io/ 
B:	https://github.com/ClangBuiltLinux/linux/issues

C:	irc://chat.freenode.net/clangbuiltlinux

F:	Documentation/kbuild/llvm.rst

F:	scripts/clang-tools/

K:	\b(?i:clang|llvm)\b















CLEANCACHE API

































Makefile



+70
−24






























Original line number
Diff line number
Diff line








@@ -497,7 +497,7 @@ KBUILD_AFLAGS   := -D__ASSEMBLY__ -fno-PIE













KBUILD_CFLAGS   := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \















		   -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \















		   -Werror=implicit-function-declaration -Werror=implicit-int \













		   -Wno-format-security \













		   -Werror=return-type -Wno-format-security \















		   -std=gnu89















KBUILD_CPPFLAGS := -D__KERNEL__















KBUILD_AFLAGS_KERNEL :=









@@ -505,7 +505,6 @@ KBUILD_CFLAGS_KERNEL :=













KBUILD_AFLAGS_MODULE  := -DMODULE















KBUILD_CFLAGS_MODULE  := -DMODULE















KBUILD_LDFLAGS_MODULE :=













export KBUILD_LDS_MODULE := $(srctree)/scripts/module-common.lds















KBUILD_LDFLAGS :=















CLANG_FLAGS :=

























@@ -517,7 +516,6 @@ export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS LDFLAGS_MODULE





























export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS KBUILD_LDFLAGS















export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE













export CFLAGS_KASAN CFLAGS_KASAN_NOSANITIZE CFLAGS_UBSAN CFLAGS_KCSAN















export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE















export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE















export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL










@@ -634,7 +632,7 @@ endif













# in addition to whatever we do anyway.















# Just "make" or "make all" shall build modules as well





























ifneq ($(filter all modules nsdeps,$(MAKECMDGOALS)),)













ifneq ($(filter all modules nsdeps %compile_commands.json clang-%,$(MAKECMDGOALS)),)















  KBUILD_MODULES := 1















endif


























@@ -707,8 +705,11 @@ $(KCONFIG_CONFIG):













# This exploits the 'multi-target pattern rule' trick.















# The syncconfig should be executed only once to make all the targets.















# (Note: use the grouped target '&:' when we bump to GNU Make 4.3)













quiet_cmd_syncconfig = SYNC    $@













      cmd_syncconfig = $(MAKE) -f $(srctree)/Makefile syncconfig





























%/config/auto.conf %/config/auto.conf.cmd %/generated/autoconf.h: $(KCONFIG_CONFIG)













	$(Q)$(MAKE) -f $(srctree)/Makefile syncconfig













	+$(call cmd,syncconfig)















else # !may-sync-config















# External modules and some install targets need include/generated/autoconf.h















# and include/config/auto.conf but do not care if they are up-to-date.










@@ -813,16 +814,22 @@ KBUILD_CFLAGS	+= -ftrivial-auto-var-init=zero













KBUILD_CFLAGS	+= -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang















endif





























DEBUG_CFLAGS	:= $(call cc-option, -fno-var-tracking-assignments)













# Workaround for GCC versions < 5.0













# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61801













ifdef CONFIG_CC_IS_GCC













DEBUG_CFLAGS	:= $(call cc-ifversion, -lt, 0500, $(call cc-option, -fno-var-tracking-assignments))













endif































ifdef CONFIG_DEBUG_INFO





























ifdef CONFIG_DEBUG_INFO_SPLIT















DEBUG_CFLAGS	+= -gsplit-dwarf















else















DEBUG_CFLAGS	+= -g















endif





























KBUILD_AFLAGS	+= -Wa,-gdwarf-2













endif





























ifdef CONFIG_DEBUG_INFO_DWARF4















DEBUG_CFLAGS	+= -gdwarf-4















endif









@@ -838,6 +845,8 @@ KBUILD_AFLAGS	+= -gz=zlib













KBUILD_LDFLAGS	+= --compress-debug-sections=zlib















endif





























endif # CONFIG_DEBUG_INFO





























KBUILD_CFLAGS += $(DEBUG_CFLAGS)















export DEBUG_CFLAGS


























@@ -919,16 +928,16 @@ KBUILD_CFLAGS += $(call cc-disable-warning, restrict)













KBUILD_CFLAGS += $(call cc-disable-warning, maybe-uninitialized)































# disable invalid "can't wrap" optimizations for signed / pointers













KBUILD_CFLAGS	+= $(call cc-option,-fno-strict-overflow)













KBUILD_CFLAGS	+= -fno-strict-overflow































# Make sure -fstack-check isn't enabled (like gentoo apparently did)













KBUILD_CFLAGS  += $(call cc-option,-fno-stack-check,)













KBUILD_CFLAGS  += -fno-stack-check































# conserve stack if available















KBUILD_CFLAGS   += $(call cc-option,-fconserve-stack)































# Prohibit date/time macros, which would make the build non-deterministic













KBUILD_CFLAGS   += $(call cc-option,-Werror=date-time)













KBUILD_CFLAGS   += -Werror=date-time































# enforce correct pointer usage















KBUILD_CFLAGS   += $(call cc-option,-Werror=incompatible-pointer-types)










@@ -964,8 +973,8 @@ KBUILD_CPPFLAGS += $(KCPPFLAGS)













KBUILD_AFLAGS   += $(KAFLAGS)















KBUILD_CFLAGS   += $(KCFLAGS)





























KBUILD_LDFLAGS_MODULE += --build-id













LDFLAGS_vmlinux += --build-id













KBUILD_LDFLAGS_MODULE += --build-id=sha1













LDFLAGS_vmlinux += --build-id=sha1































ifeq ($(CONFIG_STRIP_ASM_SYMS),y)















LDFLAGS_vmlinux	+= $(call ld-option, -X,)










@@ -1377,7 +1386,7 @@ endif













# using awk while concatenating to the final file.































PHONY += modules













modules: $(if $(KBUILD_BUILTIN),vmlinux) modules_check













modules: $(if $(KBUILD_BUILTIN),vmlinux) modules_check modules_prepare















	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost































PHONY += modules_check









@@ -1394,6 +1403,7 @@ targets += modules.order













# Target to prepare building external modules















PHONY += modules_prepare















modules_prepare: prepare













	$(Q)$(MAKE) $(build)=scripts scripts/module.lds































# Target to install modules















PHONY += modules_install










@@ -1452,7 +1462,8 @@ endif # CONFIG_MODULES





























# Directories & files removed with 'make clean'















CLEAN_FILES += include/ksym vmlinux.symvers \













	       modules.builtin modules.builtin.modinfo modules.nsdeps













	       modules.builtin modules.builtin.modinfo modules.nsdeps \













	       compile_commands.json































# Directories & files removed with 'make mrproper'















MRPROPER_FILES += include/config include/generated          \










@@ -1558,12 +1569,13 @@ help:













	 echo  ''















	@echo  'Static analysers:'















	@echo  '  checkstack      - Generate a list of stack hogs'













	@echo  '  namespacecheck  - Name space analysis on compiled kernel'















	@echo  '  versioncheck    - Sanity check on version.h usage'















	@echo  '  includecheck    - Check for duplicate included header files'















	@echo  '  export_report   - List the usages of all exported symbols'















	@echo  '  headerdep       - Detect inclusion cycles in headers'















	@echo  '  coccicheck      - Check with Coccinelle'













	@echo  '  clang-analyzer  - Check with clang static analyzer'













	@echo  '  clang-tidy      - Check with clang-tidy'















	@echo  ''















	@echo  'Tools:'















	@echo  '  nsdeps          - Generate missing symbol namespace dependencies'










@@ -1681,14 +1693,18 @@ else # KBUILD_EXTMOD













#                      Install the modules built in the module directory















#                      Assumes install directory is already created





























# We are always building modules













# We are always building only modules.













KBUILD_BUILTIN :=















KBUILD_MODULES := 1































build-dirs := $(KBUILD_EXTMOD)















PHONY += modules













modules: descend













modules: $(MODORDER)















	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost





























$(MODORDER): descend













	@:





























PHONY += modules_install















modules_install: _emodinst_ _emodinst_post

























@@ -1702,8 +1718,12 @@ PHONY += _emodinst_post













_emodinst_post: _emodinst_















	$(call cmd,depmod)





























compile_commands.json: $(extmod-prefix)compile_commands.json













PHONY += compile_commands.json





























clean-dirs := $(KBUILD_EXTMOD)













clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers $(KBUILD_EXTMOD)/modules.nsdeps













clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers $(KBUILD_EXTMOD)/modules.nsdeps \













	$(KBUILD_EXTMOD)/compile_commands.json































PHONY += help















help:









@@ -1715,7 +1735,9 @@ help:













	@echo  '  clean           - remove generated files in module directory only'















	@echo  ''





























PHONY += prepare













# no-op for external module builds













PHONY += prepare modules_prepare





























endif # KBUILD_EXTMOD































# Single targets










@@ -1748,7 +1770,7 @@ MODORDER := .modules.tmp













endif































PHONY += single_modpost













single_modpost: $(single-no-ko)













single_modpost: $(single-no-ko) modules_prepare















	$(Q){ $(foreach m, $(single-ko), echo $(extmod-prefix)$m;) } > $(MODORDER)















	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost


























@@ -1816,10 +1838,37 @@ nsdeps: export KBUILD_NSDEPS=1













nsdeps: modules















	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/nsdeps





























# Clang Tooling













# ---------------------------------------------------------------------------



























quiet_cmd_gen_compile_commands = GEN     $@













      cmd_gen_compile_commands = $(PYTHON3) $< -a $(AR) -o $@ $(filter-out $<, $(real-prereqs))



























$(extmod-prefix)compile_commands.json: scripts/clang-tools/gen_compile_commands.py \













	$(if $(KBUILD_EXTMOD),,$(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS)) \













	$(if $(CONFIG_MODULES), $(MODORDER)) FORCE













	$(call if_changed,gen_compile_commands)



























targets += $(extmod-prefix)compile_commands.json



























PHONY += clang-tidy clang-analyzer



























ifdef CONFIG_CC_IS_CLANG













quiet_cmd_clang_tools = CHECK   $<













      cmd_clang_tools = $(PYTHON3) $(srctree)/scripts/clang-tools/run-clang-tools.py $@ $<



























clang-tidy clang-analyzer: $(extmod-prefix)compile_commands.json













	$(call cmd,clang_tools)













else













clang-tidy clang-analyzer:













	@echo "$@ requires CC=clang" >&2













	@false













endif





























# Scripts to check various things for consistency















# ---------------------------------------------------------------------------





























PHONY += includecheck versioncheck coccicheck namespacecheck export_report













PHONY += includecheck versioncheck coccicheck export_report































includecheck:















	find $(srctree)/* $(RCS_FIND_IGNORE) \









@@ -1834,9 +1883,6 @@ versioncheck:













coccicheck:















	$(Q)$(BASH) $(srctree)/scripts/$@





























namespacecheck:













	$(PERL) $(srctree)/scripts/namespace.pl





























export_report:















	$(PERL) $(srctree)/scripts/export_report.pl

















































arch/arm/Makefile



+0
−4






























Original line number
Diff line number
Diff line








@@ -20,10 +20,6 @@ endif













# linker. All sections should be explicitly named in the linker script.















LDFLAGS_vmlinux += $(call ld-option, --orphan-handling=warn)





























ifeq ($(CONFIG_ARM_MODULE_PLTS),y)













KBUILD_LDS_MODULE	+= $(srctree)/arch/arm/kernel/module.lds













endif





























GZFLAGS		:=-9















#KBUILD_CFLAGS	+=-pipe

















































arch/arm/kernel/module.lds→arch/arm/include/asm/module.lds.h



+2
−0






























Original line number
Diff line number
Diff line















/* SPDX-License-Identifier: GPL-2.0 */













#ifdef CONFIG_ARM_MODULE_PLTS















SECTIONS {















	.plt : { BYTE(0) }















	.init.plt : { BYTE(0) }















}













#endif
































































CRA Git | Maintained and supported by SUSTech CRA and CCSE