Commit feb7d79f authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: read *.mod to get objects passed to $(LD) or $(AR) 



ld and ar support @file, which command-line options are read from.

Now that *.mod lists the member objects in the correct order, without
duplication, it is ready to be passed to ld and ar.

By using the @file syntax, people will not be worried about the pitfall
described in the NOTE.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
parent fc93a4cd

scripts/Makefile.build

+3 −7
Original line number Diff line number Diff line
@@ -450,22 +450,18 @@ quiet_cmd_ar_lib = AR $@ 
$(obj)/lib.a: $(lib-y) FORCE

	$(call if_changed,ar_lib)



# NOTE:

# Do not replace $(filter %.o,^) with $(real-prereqs). When a single object

# module is turned into a multi object module, $^ will contain header file

# dependencies recorded in the .*.cmd file.

ifneq ($(CONFIG_LTO_CLANG)$(CONFIG_X86_KERNEL_IBT),)

quiet_cmd_link_multi-m = AR [M]  $@

cmd_link_multi-m =						\

	$(cmd_update_lto_symversions);				\

	rm -f $@; 						\

	$(AR) cDPrsT $@ $(filter %.o,$^)

	$(AR) cDPrsT $@ @$(patsubst %.o,%.mod,$@)

else

quiet_cmd_link_multi-m = LD [M]  $@

      cmd_link_multi-m = $(LD) $(ld_flags) -r -o $@ $(filter %.o,$^)

      cmd_link_multi-m = $(LD) $(ld_flags) -r -o $@ @$(patsubst %.o,%.mod,$@)

endif



$(multi-obj-m): FORCE

$(multi-obj-m): %.o: %.mod FORCE

	$(call if_changed,link_multi-m)

$(call multi_depend, $(multi-obj-m), .o, -objs -y -m)