Commit 4ae12d8b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull Kbuild fixes from Nathan Chancellor:

 - Split out .modinfo section from ELF_DETAILS macro, as that macro may
   be used in other areas that expect to discard .modinfo, breaking
   certain image layouts

 - Adjust genksyms parser to handle optional attributes in certain
   declarations, necessary after commit 07919126 ("netfilter:
   annotate NAT helper hook pointers with __rcu")

 - Include resolve_btfids in external module build created by
   scripts/package/install-extmod-build when it may be run on external
   modules

 - Avoid removing objtool binary with 'make clean', as it is required
   for external module builds

* tag 'kbuild-fixes-7.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux:
  kbuild: Leave objtool binary around with 'make clean'
  kbuild: install-extmod-build: Package resolve_btfids if necessary
  genksyms: Fix parsing a declarator with a preceding attribute
  kbuild: Split .modinfo out from ELF_DETAILS
parents 591d8796 fdb12c8a

Makefile

+4 −4
Original line number Diff line number Diff line
@@ -1497,13 +1497,13 @@ ifneq ($(wildcard $(resolve_btfids_O)),) 
	$(Q)$(MAKE) -sC $(srctree)/tools/bpf/resolve_btfids O=$(resolve_btfids_O) clean

endif



PHONY += objtool_clean

PHONY += objtool_clean objtool_mrproper



objtool_O = $(abspath $(objtree))/tools/objtool



objtool_clean:

objtool_clean objtool_mrproper:

ifneq ($(wildcard $(objtool_O)),)

	$(Q)$(MAKE) -sC $(abs_srctree)/tools/objtool O=$(objtool_O) srctree=$(abs_srctree) clean

	$(Q)$(MAKE) -sC $(abs_srctree)/tools/objtool O=$(objtool_O) srctree=$(abs_srctree) $(patsubst objtool_%,%,$@)

endif



tools/: FORCE
@@ -1686,7 +1686,7 @@ PHONY += $(mrproper-dirs) mrproper 
$(mrproper-dirs):

	$(Q)$(MAKE) $(clean)=$(patsubst _mrproper_%,%,$@)



mrproper: clean $(mrproper-dirs)

mrproper: clean objtool_mrproper $(mrproper-dirs)

	$(call cmd,rmfiles)

	@find . $(RCS_FIND_IGNORE) \

		\( -name '*.rmeta' \) \

arch/alpha/kernel/vmlinux.lds.S

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ SECTIONS 


	STABS_DEBUG

	DWARF_DEBUG

	MODINFO

	ELF_DETAILS



	DISCARDS

arch/arc/kernel/vmlinux.lds.S

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ SECTIONS 
	_end = . ;



	STABS_DEBUG

	MODINFO

	ELF_DETAILS

	DISCARDS

arch/arm/boot/compressed/vmlinux.lds.S

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ SECTIONS 
    COMMON_DISCARDS

    *(.ARM.exidx*)

    *(.ARM.extab*)

    *(.modinfo)

    *(.note.*)

    *(.rel.*)

    *(.printk_index)

arch/arm/kernel/vmlinux-xip.lds.S

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ SECTIONS 


	STABS_DEBUG

	DWARF_DEBUG

	MODINFO

	ARM_DETAILS



	ARM_ASSERTS