[Xen-changelog] [xen stable-4.7] xen/arm: build: add missed dependency for head.S

[patchbot@xxxxxxx]

commit 8c89958cc6360836ac4e4c6442994eaaa2ed72e2
Author:     Wei Chen <wei.chen@xxxxxxxxxx>
AuthorDate: Fri Jun 3 18:07:13 2016 +0800
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Wed Jun 8 17:10:39 2016 +0100

    xen/arm: build: add missed dependency for head.S
    
    When we update the header files that had been included in head.S.
    The build system would not re-compile the head.S. Because in the
    build rules, the dependencies are setting to .*.d (eg. DEPS = .*.d)
    files in the same folder as Makefile.
    
    But head.S is very special, it was used by the Makefile in the parent
    folder: "ALL_OBJS := $(TARGET_SUBARCH)/head.o".
    
    In this case, the build system could not find the dependency in DEPS.
    When we update the header files, the build system is unware of this
    update. If we re-build the Xen without doing make clean or touching
    the head.S, the build system will not recompile the head.S.
    
    Signed-off-by: Wei Chen <Wei.Chen@xxxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    Release-acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    master commit: 9ea859dedad4fc5e2afa222569226363e1e0ed6b
---
 xen/Rules.mk          | 3 ++-
 xen/arch/arm/Makefile | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 961d533..1247b61 100644
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -92,9 +92,10 @@ LDFLAGS += $(LDFLAGS-y)
 
 include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk
 
+DEPS = .*.d
+
 include Makefile
 
-DEPS = .*.d
 define gendep
     ifneq ($(1),$(subst /,:,$(1)))
         DEPS += $(dir $(1)).$(notdir $(1)).d
diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile
index af4d0e1..9e38da3 100644
--- a/xen/arch/arm/Makefile
+++ b/xen/arch/arm/Makefile
@@ -51,6 +51,8 @@ endif
 
 ALL_OBJS := $(TARGET_SUBARCH)/head.o $(ALL_OBJS)
 
+DEPS += $(TARGET_SUBARCH)/.head.o.d
+
 $(TARGET): $(TARGET)-syms $(TARGET).axf
        $(OBJCOPY) -O binary -S $< $@
 ifeq ($(CONFIG_ARM_64),y)
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.7

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog