Commit 5c5e048b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull Kbuild updates from Masahiro Yamada:

 - Implement the binary search in modpost for faster symbol lookup

 - Respect HOSTCC when linking host programs written in Rust

 - Change the binrpm-pkg target to generate kernel-devel RPM package

 - Fix endianness issues for tee and ishtp MODULE_DEVICE_TABLE

 - Unify vdso_install rules

 - Remove unused __memexit* annotations

 - Eliminate stale whitelisting for __devinit/__devexit from modpost

 - Enable dummy-tools to handle the -fpatchable-function-entry flag

 - Add 'userldlibs' syntax

* tag 'kbuild-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (30 commits)
  kbuild: support 'userldlibs' syntax
  kbuild: dummy-tools: pretend we understand -fpatchable-function-entry
  kbuild: Correct missing architecture-specific hyphens
  modpost: squash ALL_{INIT,EXIT}_TEXT_SECTIONS to ALL_TEXT_SECTIONS
  modpost: merge sectioncheck table entries regarding init/exit sections
  modpost: use ALL_INIT_SECTIONS for the section check from DATA_SECTIONS
  modpost: disallow the combination of EXPORT_SYMBOL and __meminit*
  modpost: remove EXIT_SECTIONS macro
  modpost: remove MEM_INIT_SECTIONS macro
  modpost: remove more symbol patterns from the section check whitelist
  modpost: disallow *driver to reference .meminit* sections
  linux/init: remove __memexit* annotations
  modpost: remove ALL_EXIT_DATA_SECTIONS macro
  kbuild: simplify cmd_ld_multi_m
  kbuild: avoid too many execution of scripts/pahole-flags.sh
  kbuild: remove ARCH_POSTLINK from module builds
  kbuild: unify no-compiler-targets and no-sync-config-targets
  kbuild: unify vdso_install rules
  docs: kbuild: add INSTALL_DTBS_PATH
  UML: remove unused cmd_vdso_install
  ...
parents 3062a987 5f56cb03

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ modules.order 
#

# RPM spec file (make rpm-pkg)

#

/kernel.spec

/rpmbuild/



#

Documentation/kbuild/kbuild.rst

+6 −0
Original line number Diff line number Diff line
@@ -243,6 +243,12 @@ The output directory is often set using "O=..." on the commandline. 


The value can be overridden in which case the default value is ignored.



INSTALL_DTBS_PATH

-----------------

INSTALL_DTBS_PATH specifies where to install device tree blobs for

relocations required by build roots.  This is not defined in the

makefile but the argument can be passed to make if needed.



KBUILD_ABS_SRCTREE

--------------------------------------------------

Kbuild uses a relative path to point to the tree when possible. For instance,

Documentation/kbuild/makefiles.rst

+11 −0
Original line number Diff line number Diff line
@@ -937,6 +937,10 @@ Example:: 
  # net/bpfilter/Makefile

  bpfilter_umh-userldflags += -static



To specify libraries linked to a userspace program, you can use

``<executable>-userldlibs``. The ``userldlibs`` syntax specifies libraries

linked to all userspace programs created in the current Makefile.



When linking bpfilter_umh, it will be passed the extra option -static.



From command line, :ref:`USERCFLAGS and USERLDFLAGS <userkbuildflags>` will also be used.
@@ -1623,6 +1627,13 @@ INSTALL_MOD_STRIP 
  INSTALL_MOD_STRIP value will be used as the option(s) to the strip

  command.



INSTALL_DTBS_PATH

  This variable specifies a prefix for relocations required by build

  roots. It defines a place for installing the device tree blobs. Like

  INSTALL_MOD_PATH, it isn't defined in the Makefile, but can be passed

  by the user if desired. Otherwise it defaults to the kernel install

  path.



Makefile language

=================

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3781,7 +3781,7 @@ F: net/sched/act_bpf.c 
F:	net/sched/cls_bpf.c

F:	samples/bpf/

F:	scripts/bpf_doc.py

F:	scripts/pahole-flags.sh

F:	scripts/Makefile.btf

F:	scripts/pahole-version.sh

F:	tools/bpf/

F:	tools/lib/bpf/

Makefile

+18 −20
Original line number Diff line number Diff line
@@ -277,10 +277,6 @@ no-dot-config-targets := $(clean-targets) \ 
			 $(version_h) headers headers_% archheaders archscripts \

			 %asm-generic kernelversion %src-pkg dt_binding_check \

			 outputmakefile rustavailable rustfmt rustfmtcheck

# Installation targets should not require compiler. Unfortunately, vdso_install

# is an exception where build artifacts may be updated. This must be fixed.

no-compiler-targets := $(no-dot-config-targets) install dtbs_install \

			headers_install modules_install modules_sign kernelrelease image_name

no-sync-config-targets := $(no-dot-config-targets) %install modules_sign kernelrelease \

			  image_name

single-targets := %.a %.i %.ko %.lds %.ll %.lst %.mod %.o %.rsi %.s %.symtypes %/
@@ -288,7 +284,6 @@ single-targets := %.a %.i %.ko %.lds %.ll %.lst %.mod %.o %.rsi %.s %.symtypes % 
config-build	:=

mixed-build	:=

need-config	:= 1

need-compiler	:= 1

may-sync-config	:= 1

single-build	:=
@@ -298,18 +293,14 @@ ifneq ($(filter $(no-dot-config-targets), $(MAKECMDGOALS)),) 
	endif

endif



ifneq ($(filter $(no-compiler-targets), $(MAKECMDGOALS)),)

	ifeq ($(filter-out $(no-compiler-targets), $(MAKECMDGOALS)),)

		need-compiler :=

	endif

endif



ifneq ($(filter $(no-sync-config-targets), $(MAKECMDGOALS)),)

	ifeq ($(filter-out $(no-sync-config-targets), $(MAKECMDGOALS)),)

		may-sync-config :=

	endif

endif



need-compiler := $(may-sync-config)



ifneq ($(KBUILD_EXTMOD),)

	may-sync-config :=

endif
@@ -522,8 +513,6 @@ LZ4 = lz4c 
XZ		= xz

ZSTD		= zstd



PAHOLE_FLAGS	= $(shell PAHOLE=$(PAHOLE) $(srctree)/scripts/pahole-flags.sh)



CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \

		  -Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF)

NOSTDINC_FLAGS :=
@@ -614,7 +603,6 @@ export KBUILD_RUSTFLAGS RUSTFLAGS_KERNEL RUSTFLAGS_MODULE 
export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE

export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_RUSTFLAGS_MODULE KBUILD_LDFLAGS_MODULE

export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL KBUILD_RUSTFLAGS_KERNEL

export PAHOLE_FLAGS



# Files to ignore in find ... statements
@@ -684,7 +672,7 @@ ifdef config-build 
# *config targets only - make sure prerequisites are updated, and descend

# in scripts/kconfig to make the *config target



# Read arch specific Makefile to set KBUILD_DEFCONFIG as needed.

# Read arch-specific Makefile to set KBUILD_DEFCONFIG as needed.

# KBUILD_DEFCONFIG may point out an alternative default configuration

# used for 'make defconfig'

include $(srctree)/arch/$(SRCARCH)/Makefile
@@ -698,7 +686,7 @@ config: outputmakefile scripts_basic FORCE 


else #!config-build

# ===========================================================================

# Build targets only - this includes vmlinux, arch specific targets, clean

# Build targets only - this includes vmlinux, arch-specific targets, clean

# targets and others. In general all targets except *config targets.



# If building an external module we do not care about the all: rule
@@ -1011,6 +999,7 @@ KBUILD_CPPFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=) 
# include additional Makefiles when needed

include-y			:= scripts/Makefile.extrawarn

include-$(CONFIG_DEBUG_INFO)	+= scripts/Makefile.debug

include-$(CONFIG_DEBUG_INFO_BTF)+= scripts/Makefile.btf

include-$(CONFIG_KASAN)		+= scripts/Makefile.kasan

include-$(CONFIG_KCSAN)		+= scripts/Makefile.kcsan

include-$(CONFIG_KMSAN)		+= scripts/Makefile.kmsan
@@ -1317,6 +1306,14 @@ scripts_unifdef: scripts_basic 
quiet_cmd_install = INSTALL $(INSTALL_PATH)

      cmd_install = unset sub_make_done; $(srctree)/scripts/install.sh



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

# vDSO install



PHONY += vdso_install

vdso_install: export INSTALL_FILES = $(vdso-install-y)

vdso_install:

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



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

# Tools
@@ -1486,7 +1483,7 @@ MRPROPER_FILES += include/config include/generated \ 
		  certs/signing_key.pem \

		  certs/x509.genkey \

		  vmlinux-gdb.py \

		  kernel.spec rpmbuild \

		  rpmbuild \

		  rust/libmacros.so



# clean - Delete most, but leave enough to build external modules
@@ -1560,6 +1557,7 @@ help: 
	@echo  '* vmlinux	  - Build the bare kernel'

	@echo  '* modules	  - Build all modules'

	@echo  '  modules_install - Install all modules to INSTALL_MOD_PATH (default: /)'

	@echo  '  vdso_install    - Install unstripped vdso to INSTALL_MOD_PATH (default: /)'

	@echo  '  dir/            - Build all files in dir and below'

	@echo  '  dir/file.[ois]  - Build specified target only'

	@echo  '  dir/file.ll     - Build the LLVM assembly file'
@@ -1637,9 +1635,9 @@ help: 
	@echo  'Documentation targets:'

	@$(MAKE) -f $(srctree)/Documentation/Makefile dochelp

	@echo  ''

	@echo  'Architecture specific targets ($(SRCARCH)):'

	@echo  'Architecture-specific targets ($(SRCARCH)):'

	@$(or $(archhelp),\

		echo '  No architecture specific help defined for $(SRCARCH)')

		echo '  No architecture-specific help defined for $(SRCARCH)')

	@echo  ''

	@$(if $(boards), \

		$(foreach b, $(boards), \
@@ -1681,7 +1679,7 @@ help-boards: $(help-board-dirs) 
boards-per-dir = $(sort $(notdir $(wildcard $(srctree)/arch/$(SRCARCH)/configs/$*/*_defconfig)))



$(help-board-dirs): help-%:

	@echo  'Architecture specific targets ($(SRCARCH) $*):'

	@echo  'Architecture-specific targets ($(SRCARCH) $*):'

	@$(if $(boards-per-dir), \

		$(foreach b, $(boards-per-dir), \

		printf "  %-24s - Build for %s\\n" $*/$(b) $(subst _defconfig,,$(b));) \