[Xen-devel] [PATCH v2] xen: xen.lds should depend on Kconfig's auto.conf

[Wei Liu <wei.liu2@xxxxxxxxxx>]

xen.lds.S uses on some of the config options set by Kconfig.

Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
v2: correct the path used in the patch.
---
 xen/arch/arm/Makefile | 2 +-
 xen/arch/x86/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile
index b9b141dc84..55c1bf032f 100644
--- a/xen/arch/arm/Makefile
+++ b/xen/arch/arm/Makefile
@@ -124,7 +124,7 @@ $(TARGET)-syms: prelink.o xen.lds 
$(BASEDIR)/common/symbols-dummy.o
 asm-offsets.s: $(TARGET_SUBARCH)/asm-offsets.c
        $(CC) $(filter-out -flto,$(CFLAGS)) -S -o $@ $<
 
-xen.lds: xen.lds.S
+xen.lds: xen.lds.S ../../include/config/auto.conf
        $(CC) -P -E -Ui386 $(AFLAGS) -o $@ $<
        sed -e 's/xen\.lds\.o:/xen\.lds:/g' <.xen.lds.d >.xen.lds.d.new
        mv -f .xen.lds.d.new .xen.lds.d
diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index 9b9b63ac63..bb7e1d966c 100644
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -218,12 +218,12 @@ efi/boot.init.o efi/runtime.o efi/compat.o efi/buildid.o: 
;
 asm-offsets.s: $(TARGET_SUBARCH)/asm-offsets.c
        $(CC) $(filter-out -Wa$(comma)% -flto,$(CFLAGS)) -S -o $@ $<
 
-xen.lds: xen.lds.S
+xen.lds: xen.lds.S ../../include/config/auto.conf
        $(CC) -P -E -Ui386 $(filter-out -Wa$(comma)%,$(AFLAGS)) -o $@ $<
        sed -e 's/xen\.lds\.o:/xen\.lds:/g' <.xen.lds.d >.xen.lds.d.new
        mv -f .xen.lds.d.new .xen.lds.d
 
-efi.lds: xen.lds.S
+efi.lds: xen.lds.S ../../include/config/auto.conf
        $(CC) -P -E -Ui386 -DEFI $(filter-out -Wa$(comma)%,$(AFLAGS)) -o $@ $<
        sed -e 's/efi\.lds\.o:/efi\.lds:/g' <.$(@F).d >.$(@F).d.new
        mv -f .$(@F).d.new .$(@F).d
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel