kbuild: remove unneeded link_multi_deps (69ea912f) · Commits · 戴 / test

Since commit ("kbuild: handle multi-objs dependency appropriately"), $^ really represents all the prerequisite of the composite object being built. Hence, $(filter %.o,$^) contains all the objects to link together, which is much simpler than link_multi_deps calculation. Please note $(filter-out FORCE,$^) does not work here. When a single object module is turned into a multi object module, $^ will contain header files that were previously included for building the single object, and recorded in the .*.cmd file. To filter out such headers, $(filter %.o,$^) should be used here. Signed-off-by:

Masahiro Yamada <yamada.masahiro@socionext.com>

scripts/Makefile.build

+2 −18

Original line number	Diff line number	Diff line
		@@ -485,28 +485,12 @@ targets += $(obj)/lib-ksyms.o

		endif

		#
		# Rule to link composite objects
		#
		# Composite objects are specified in kbuild makefile as follows:
		# <composite-object>-objs := <list of .o files>
		# or
		# <composite-object>-y := <list of .o files>
		# or
		# <composite-object>-m := <list of .o files>
		# The -m syntax only works if <composite object> is a module
		link_multi_deps = \
		$(filter $(addprefix $(obj)/, \
		$($(subst $(obj)/,,$(@:.o=-objs))) \
		$($(subst $(obj)/,,$(@:.o=-y))) \
		$($(subst $(obj)/,,$(@:.o=-m)))), $^)

		quiet_cmd_link_multi-m = LD [M] $@
		cmd_link_multi-m = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) $(cmd_secanalysis)
		cmd_link_multi-m = $(LD) $(ld_flags) -r -o $@ $(filter %.o,$^) $(cmd_secanalysis)

		$(multi-used-m): FORCE
		$(call if_changed,link_multi-m)
		@{ echo $(@:.o=.ko); echo $(link_multi_deps); \
		@{ echo $(@:.o=.ko); echo $(filter %.o,$^); \
		$(cmd_undef_syms); } > $(MODVERDIR)/$(@F:.o=.mod)
		$(call multi_depend, $(multi-used-m), .o, -objs -y -m)

Admin message