Re: [Xen-devel] [PATCH] x86/efi: fix build with linkers that support both coff-x86-64 and pe-x86-64

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 17.01.18 at 12:21, <roger.pau@xxxxxxxxxx> wrote:
> On Mon, Jan 08, 2018 at 03:11:21AM -0700, Jan Beulich wrote:
>> >>> On 05.01.18 at 17:43, <roger.pau@xxxxxxxxxx> wrote:
>> > --- a/xen/arch/x86/Makefile
>> > +++ b/xen/arch/x86/Makefile
>> > @@ -188,20 +188,20 @@ endif
>> >  $(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o 
>> > $(BASEDIR)/common/symbols-dummy.o efi/mkreloc
>> >    $(foreach base, $(VIRT_BASE) $(ALT_BASE), \
>> >              $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< 
>> > efi/relocs-dummy.o \
>> > -                  $(BASEDIR)/common/symbols-dummy.o $(note_file) -o 
>> > $(@D)/.$(@F).$(base).0 &&) :
>> > +                  $(BASEDIR)/common/symbols-dummy.o -b pe-x86-64 
>> > $(note_file) -o $(@D)/.$(@F).$(base).0 &&) :
>> 
>> I wonder whether introducing e.g
>> 
>> note_file_options := -b pe-x86-64 $(note_file)
>> 
>> wouldn't be better than repeating the same thing three times.
>> Of course it would need to be clearly spelled out that this
>> needs to come last (or another -b would need to follow). This
>> would additionally deal with the case where note.o instead of
>> efi/buildid.o is being linked in (you don't want -b pe-x86-64
>> with that one, I suppose), or when build ID support isn't
>> available at all (the new option would then be stray and might
>> be warned about).
> 
> What about doing something like:
> 
> ifneq ($(build_id_linker),)
> ifeq ($(call ld-ver-build-id,$(LD) $(filter -m%,$(EFI_LDFLAGS))),y)
> CFLAGS += -DBUILD_ID_EFI
> EFI_LDFLAGS += $(build_id_linker)
> # Note that this must be the last input in the ld call, because
> # inputs following the -b option will all be treated as being in the
> # specified format.
> note_file := -b pe-x86-64 efi/buildid.o

I'm afraid this will not work with the use of $(note_file) as a
dependency of xen.efi (indeed I first too had been considering
simply extending this variable).

Jan


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel