From: Anthony PERARD Date: Thu, 14 Oct 2021 10:35:42 +0000 (+0200) Subject: build: fix dependencies in arch/x86/boot X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~89 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2f5f0a1b77161993c16c4cc243467d75e5b7633b;p=xen.git build: fix dependencies in arch/x86/boot Temporary fix the list of headers that cmdline.c and reloc.c depends on, until the next time the list is out of sync again. Also, add the linker script to the list. Signed-off-by: Anthony PERARD Reviewed-by: Jan Beulich --- diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile index 9b31bfcbfb..d2eb277d42 100644 --- a/xen/arch/x86/boot/Makefile +++ b/xen/arch/x86/boot/Makefile @@ -2,19 +2,22 @@ obj-bin-y += head.o DEFS_H_DEPS = defs.h $(BASEDIR)/include/xen/stdbool.h -CMDLINE_DEPS = $(DEFS_H_DEPS) video.h +CMDLINE_DEPS = $(DEFS_H_DEPS) video.h \ + $(BASEDIR)/include/xen/kconfig.h \ + $(BASEDIR)/include/generated/autoconf.h RELOC_DEPS = $(DEFS_H_DEPS) \ $(BASEDIR)/include/generated/autoconf.h \ $(BASEDIR)/include/xen/kconfig.h \ $(BASEDIR)/include/xen/multiboot.h \ $(BASEDIR)/include/xen/multiboot2.h \ + $(BASEDIR)/include/xen/const.h \ $(BASEDIR)/include/public/arch-x86/hvm/start_info.h head.o: cmdline.S reloc.S -cmdline.S: cmdline.c $(CMDLINE_DEPS) +cmdline.S: cmdline.c $(CMDLINE_DEPS) build32.lds $(MAKE) -f build32.mk $@ CMDLINE_DEPS="$(CMDLINE_DEPS)" -reloc.S: reloc.c $(RELOC_DEPS) +reloc.S: reloc.c $(RELOC_DEPS) build32.lds $(MAKE) -f build32.mk $@ RELOC_DEPS="$(RELOC_DEPS)" diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk index 8cd5403926..e90680cd9f 100644 --- a/xen/arch/x86/boot/build32.mk +++ b/xen/arch/x86/boot/build32.mk @@ -27,7 +27,7 @@ CFLAGS := $(filter-out -flto,$(CFLAGS)) done $(OBJCOPY) -O binary -R .got.plt $< $@ -%.lnk: %.o +%.lnk: %.o build32.lds $(LD) $(LDFLAGS_DIRECT) -N -T build32.lds -o $@ $< %.o: %.c