x86/boot: fix reloc.S build dependencies

reloc.S is not rebuild if header included
in reloc.c is updated. Fix this issue.

Additionally, remove reloc.S build dependency
on head.S because anything from reloc.S does
not depend on head.S.

Add reloc.c dependency to reloc.o build rule for consistency.

Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile
index 13f4a66c92d57a641d315bc140db305e13313a60..5fdb5aee7be0e0e5242c763d69d97902082e7f5b 100644 (file)
--- a/xen/arch/x86/boot/Makefile
+++ b/xen/arch/x86/boot/Makefile
@@ -1,8 +1,8 @@
 obj-bin-y += head.o
 
-head.o: reloc.S
+RELOC_DEPS = $(BASEDIR)/include/asm-x86/config.h $(BASEDIR)/include/xen/multiboot.h
 
-%.S: %.c
-       $(MAKE) -f build32.mk $@
+head.o: reloc.S
 
-reloc.S: head.S
+reloc.S: reloc.c $(RELOC_DEPS)
+       $(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 a36f62064e309bd42f06c87d9599373b133a68a7..c208249ca8e5b46575cf5fc9c11c24c6bc766474 100644 (file)
--- a/xen/arch/x86/boot/build32.mk
+++ b/xen/arch/x86/boot/build32.mk
@@ -30,5 +30,6 @@ CFLAGS := $(filter-out -flto,$(CFLAGS))
                        esac; \
                done
 
-reloc.o: $(BASEDIR)/include/asm-x86/config.h
+reloc.o: reloc.c $(RELOC_DEPS)
+
 .PRECIOUS: %.bin %.lnk