From: Anthony PERARD Date: Fri, 15 Nov 2019 13:18:16 +0000 (+0100) Subject: x86: fix race to build arch/x86/efi/relocs-dummy.o X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=65d104984c04e69234f77bd3b8f8c0ef85b3f7fa;p=people%2Froyger%2Fxen.git x86: fix race to build arch/x86/efi/relocs-dummy.o With $(TARGET).efi depending on efi/relocs-dummy.o, arch/x86/Makefile will attempt to build that object. This may result in a dependency file being generated that has relocs-dummy.o depending on efi/relocs-dummy.S. Then, when arch/x86/efi/Makefile tries to build relocs-dummy.o, well efi/relocs-dummy.S doesn't exist. Have only one makefile responsible for building relocs-dummy.o. Signed-off-by: Anthony PERARD Reviewed-by: Jan Beulich Release-acked-by: Juergen Gross --- diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 5e6b9d7028..a6df19e901 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -219,8 +219,8 @@ $(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o efi/mkreloc | $(BASEDIR)/tools/symbols --xensyms --sysv --sort >$(@D)/$(@F).map; fi rm -f $(@D)/.$(@F).[0-9]* $(@D)/..$(@F).[0-9]* -efi/boot.init.o efi/runtime.o efi/compat.o efi/buildid.o: $(BASEDIR)/arch/x86/efi/built_in.o -efi/boot.init.o efi/runtime.o efi/compat.o efi/buildid.o: ; +efi/boot.init.o efi/runtime.o efi/compat.o efi/buildid.o efi/relocs-dummy.o: $(BASEDIR)/arch/x86/efi/built_in.o +efi/boot.init.o efi/runtime.o efi/compat.o efi/buildid.o efi/relocs-dummy.o: ; asm-offsets.s: $(TARGET_SUBARCH)/asm-offsets.c $(BASEDIR)/include/asm-x86/asm-macros.h $(CC) $(filter-out -Wa$(comma)% -flto,$(CFLAGS)) -S -o $@ $<