On Fri, Mar 18, 2022 at 03:15:59AM +0900, Masahiro Yamada wrote: This is somewhat similar to my first attempt, except I thought it had a extra/superflous link pass in it.. > @@ -288,24 +289,24 @@ $(obj)/%.o: $(src)/%.c $(recordmcount_source) FORCE > $(call if_changed_rule,cc_o_c) > $(call cmd,force_checksrc) > > -ifdef CONFIG_LTO_CLANG > +ifneq ($(CONFIG_LTO_CLANG)$(CONFIG_X86_KERNEL_IBT),) > # Module .o files may contain LLVM bitcode, compile them into native code > # before ELF processing > -quiet_cmd_cc_lto_link_modules = LTO [M] $@ > -cmd_cc_lto_link_modules = \ > +quiet_cmd_cc_prelink_modules = LD [M] $@ > + cmd_cc_prelink_modules = \ > $(LD) $(ld_flags) -r -o $@ \ > - $(shell [ -s $(@:.lto.o=.o.symversions) ] && \ > - echo -T $(@:.lto.o=.o.symversions)) \ > + $(shell [ -s $(@:.prelink.o=.o.symversions) ] && > \ > + echo -T $(@:.prelink.o=.o.symversions)) \ > --whole-archive $(filter-out FORCE,$^) \ > $(cmd_objtool) > > @@ -469,7 +470,7 @@ $(obj)/lib.a: $(lib-y) FORCE > # 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. > -ifdef CONFIG_LTO_CLANG > +ifneq ($(CONFIG_LTO_CLANG)$(CONFIG_X86_KERNEL_IBT),) > quiet_cmd_link_multi-m = AR [M] $@ > cmd_link_multi-m = \ > $(cmd_update_lto_symversions); \ Except I overlooked this part, where ar is used instead of ld to combine the individual files. Let me go make the change, Thanks!
