[Xen-changelog] [xen master] libacpi: fix arm64 build

[patchbot@xxxxxxx]

commit 344da4f3ad6c4f76ef4efd530f4b1cc6901d6ff9
Author:     Wei Liu <wei.liu2@xxxxxxxxxx>
AuthorDate: Fri Oct 14 18:02:30 2016 +0100
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Mon Oct 17 11:46:02 2016 +0100

    libacpi: fix arm64 build
    
    The arm64 build for libacpi was broken due to two reasons:
    
    1. ACPI_BUILD_DIR was appended twice to dsdt_anycpu_arm.c.
    2. The inclusion of firmware/Rules.mk overrided XEN_TARGET_ARCH, which
       made CONFIG_ARM disappear.
    
    Fix those by:
    
    1. Correctly generate full path for dsdt_anaycpu_arm.c.
    2. Include tools/Rules.mk instead, because libacpi/Makefile doesn't rely
       on settings in firmware/Rules.mk.
    
    While at it, use CONFIG_ARM_64 instead of CONFIG_ARM as it is more
    accurate.
    
    Reported-by: Julien Grall <julien.grall@xxxxxxx>
    Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 tools/libacpi/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/libacpi/Makefile b/tools/libacpi/Makefile
index db7a3a9..24eb0c2 100644
--- a/tools/libacpi/Makefile
+++ b/tools/libacpi/Makefile
@@ -13,12 +13,12 @@
 #
 
 XEN_ROOT = $(CURDIR)/../..
-include $(XEN_ROOT)/tools/firmware/Rules.mk
+include $(XEN_ROOT)/tools/Rules.mk
 
 MK_DSDT = $(ACPI_BUILD_DIR)/mk_dsdt
 
 C_SRC-$(GPL) = dsdt_anycpu.c dsdt_15cpu.c dsdt_anycpu_qemu_xen.c
-C_SRC-$(CONFIG_ARM) = $(ACPI_BUILD_DIR)/dsdt_anycpu_arm.c
+C_SRC-$(CONFIG_ARM_64) = dsdt_anycpu_arm.c
 C_SRC = $(addprefix $(ACPI_BUILD_DIR)/, dsdt_pvh.c $(C_SRC-y))
 H_SRC = $(addprefix $(ACPI_BUILD_DIR)/, ssdt_s3.h ssdt_s4.h ssdt_pm.h 
ssdt_tpm.h)
 
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog