| Message ID | 20240908-kbuild-cmd_ld_ko_o-v1-1-a4afc3c2d47a@weissschuh.net (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | kbuild: remove append operation on cmd_ld_ko_o | expand |
On Sun, Sep 8, 2024 at 10:26 PM Thomas Weißschuh <linux@weissschuh.net> wrote: > > The append operation was introduced in > commit b1a1a1a09b46 ("kbuild: lto: postpone objtool") > when the command was created from two parts. > In commit 850ded46c642 ("kbuild: Fix TRIM_UNUSED_KSYMS with LTO_CLANG") > however the first part was removed again, making the append operation > unnecessary. > > To keep this command definition aligned with all other command > definitions, remove the append again. > > Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> Applied to linux-kbuild. Thanks! > --- > scripts/Makefile.modfinal | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal > index 6b1b72257b29..1482884ec3ca 100644 > --- a/scripts/Makefile.modfinal > +++ b/scripts/Makefile.modfinal > @@ -34,7 +34,7 @@ $(extmod_prefix).module-common.o: $(srctree)/scripts/module-common.c FORCE > $(call if_changed_dep,cc_o_c) > > quiet_cmd_ld_ko_o = LD [M] $@ > - cmd_ld_ko_o += \ > + cmd_ld_ko_o = \ > $(LD) -r $(KBUILD_LDFLAGS) \ > $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ > -T scripts/module.lds -o $@ $(filter %.o, $^) > > --- > base-commit: 4dda2081d84398248af60da1d519840a5d6e3390 > change-id: 20240908-kbuild-cmd_ld_ko_o-25bd49b384e8 > > Best regards, > -- > Thomas Weißschuh <linux@weissschuh.net> >
diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal index 6b1b72257b29..1482884ec3ca 100644 --- a/scripts/Makefile.modfinal +++ b/scripts/Makefile.modfinal @@ -34,7 +34,7 @@ $(extmod_prefix).module-common.o: $(srctree)/scripts/module-common.c FORCE $(call if_changed_dep,cc_o_c) quiet_cmd_ld_ko_o = LD [M] $@ - cmd_ld_ko_o += \ + cmd_ld_ko_o = \ $(LD) -r $(KBUILD_LDFLAGS) \ $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ -T scripts/module.lds -o $@ $(filter %.o, $^)
The append operation was introduced in commit b1a1a1a09b46 ("kbuild: lto: postpone objtool") when the command was created from two parts. In commit 850ded46c642 ("kbuild: Fix TRIM_UNUSED_KSYMS with LTO_CLANG") however the first part was removed again, making the append operation unnecessary. To keep this command definition aligned with all other command definitions, remove the append again. Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> --- scripts/Makefile.modfinal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: 4dda2081d84398248af60da1d519840a5d6e3390 change-id: 20240908-kbuild-cmd_ld_ko_o-25bd49b384e8 Best regards,