[xen stable-4.15] build: fix dependencies in arch/x86/boot

[patchbot@xxxxxxx]

commit 7eaf2a39c4061bdd7d1948f4848926ed5b5058b7
Author:     Anthony PERARD <anthony.perard@xxxxxxxxxx>
AuthorDate: Fri Nov 19 09:26:54 2021 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Nov 19 09:26:54 2021 +0100

    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 <anthony.perard@xxxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
    master commit: 2f5f0a1b77161993c16c4cc243467d75e5b7633b
    master date: 2021-10-14 12:35:42 +0200
---
 xen/arch/x86/boot/Makefile   | 9 ++++++---
 xen/arch/x86/boot/build32.mk | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

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
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.15