On 01.04.2025 16:47, Andrew Cooper wrote: > In all cases, "-T $(obj)/xen.lds" can be factored out by appending to > XEN_LDFLAGS. This takes the $(LD) commands from multi-line to single-line. > > x86 uses $(build_id_linker) for all links, so factor that out too. > > No functional change. > > Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
Reviewed-by: Jan Beulich <jbeul...@suse.com> However, ... > --- a/xen/arch/arm/Makefile > --- a/xen/arch/x86/Makefile > +++ b/xen/arch/x86/Makefile > @@ -138,21 +138,19 @@ $(TARGET): $(TARGET)-syms $(efi-y) $(obj)/boot/mkelf32 > > CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI > > +$(TARGET)-syms: XEN_LDFLAGS += -T $(obj)/xen.lds $(build_id_linker) > $(TARGET)-syms: $(objtree)/prelink.o $(obj)/xen.lds > - $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< $(build_id_linker) \ > - $(objtree)/common/symbols-dummy.o -o $(dot-target).0 > + $(LD) $(XEN_LDFLAGS) $< $(objtree)/common/symbols-dummy.o -o > $(dot-target).0 > $(NM) -pa --format=sysv $(dot-target).0 \ > | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \ > > $(dot-target).0.S > $(MAKE) $(build)=$(@D) $(dot-target).0.o > - $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< $(build_id_linker) \ > - $(dot-target).0.o -o $(dot-target).1 > + $(LD) $(XEN_LDFLAGS) $< $(dot-target).0.o -o $(dot-target).1 > $(NM) -pa --format=sysv $(dot-target).1 \ > | $(objtree)/tools/symbols $(all_symbols) --sysv --sort > $(syms-warn-dup-y) \ > > $(dot-target).1.S > $(MAKE) $(build)=$(@D) $(dot-target).1.o > - $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds $< $(build_id_linker) \ > - $(orphan-handling-y) $(dot-target).1.o -o $@ > + $(LD) $(XEN_LDFLAGS) $< $(orphan-handling-y) $(dot-target).1.o -o $@ > $(NM) -pa --format=sysv $@ \ > | $(objtree)/tools/symbols --all-symbols --xensyms --sysv > --sort \ > > $@.map ... any reason not to do the same for xen.efi's EFI_LDFLAGS and its -T $(obj)/efi.lds? I'd really like to keep the two rules as closely in sync as possible, to make it a little easier to eventually split them into a chain of smaller rules. Jan
