| Message ID | 1538627119-11346-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | 69ea912fda74a673d330d23595385e5b73e3a2b9 |
| Headers | show |
| Series | [v2] kbuild: remove unneeded link_multi_deps | expand |
On Thu, Oct 4, 2018 at 1:25 PM Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > > Since commit c8589d1e9e01 ("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. $(filter %.o,$^) > should be used to filter out such headers. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > Changes in v2: > - Fix regression reported in linux-next. > https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1779047.html V2 replaced V1. > scripts/Makefile.build | 20 ++------------------ > 1 file changed, 2 insertions(+), 18 deletions(-) > > diff --git a/scripts/Makefile.build b/scripts/Makefile.build > index cb03774..f21b48d 100644 > --- a/scripts/Makefile.build > +++ b/scripts/Makefile.build > @@ -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) > > -- > 2.7.4 > -- Best Regards Masahiro Yamada
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index cb03774..f21b48d 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -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)
Since commit c8589d1e9e01 ("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. $(filter %.o,$^) should be used to filter out such headers. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- Changes in v2: - Fix regression reported in linux-next. https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1779047.html scripts/Makefile.build | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) -- 2.7.4