Commit a7c4127a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v6.2-2' of... 

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

Pull Kbuild fixes from Masahiro Yamada:

 - Fix single *.ko build

 - Fix module builds when vmlinux.o or Module.symver is missing

* tag 'kbuild-fixes-v6.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kbuild: readd -w option when vmlinux.o or Module.symver is missing
  kbuild: fix single *.ko build
parents 0a715535 735aec59

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1986,7 +1986,7 @@ $(single-no-ko): $(build-dir) 
# Remove MODORDER when done because it is not the real one.

PHONY += single_modules

single_modules: $(single-no-ko) modules_prepare

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

	$(Q){ $(foreach m, $(single-ko), echo $(extmod_prefix)$(m:%.ko=%.o);) } > $(MODORDER)

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

ifneq ($(KBUILD_MODPOST_NOFINAL),1)

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

scripts/Makefile.modpost

+5 −4
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ modpost-args = \ 
	$(if $(CONFIG_MODVERSIONS),-m)							\

	$(if $(CONFIG_MODULE_SRCVERSION_ALL),-a)					\

	$(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E)					\

	$(if $(KBUILD_MODPOST_WARN),-w)							\

	$(if $(KBUILD_NSDEPS),-d $(MODULES_NSDEPS))					\

	$(if $(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS)$(KBUILD_NSDEPS),-N)	\

	-o $@
@@ -55,10 +56,6 @@ ifneq ($(findstring i,$(filter-out --%,$(MAKEFLAGS))),) 
modpost-args += -n

endif



ifneq ($(KBUILD_MODPOST_WARN)$(missing-input),)

modpost-args += -w

endif



# Read out modules.order to pass in modpost.

# Otherwise, allmodconfig would fail with "Argument list too long".

ifdef KBUILD_MODULES
@@ -124,6 +121,10 @@ modpost-args += -e $(addprefix -i , $(KBUILD_EXTRA_SYMBOLS)) 


endif # ($(KBUILD_EXTMOD),)



ifneq ($(missing-input),)

modpost-args += -w

endif



quiet_cmd_modpost = MODPOST $@

      cmd_modpost = \

	$(if $(missing-input), \