[Xen-changelog] [xen stable-4.9] libxl/arm: Fix build on arm64 + acpi

[patchbot@xxxxxxx]

commit 6b1a2704e7135d0781c4719616f6dac4a7bb904b
Author:     Daniel Sabogal <dsabogalcc@xxxxxxxxx>
AuthorDate: Fri Aug 25 17:35:47 2017 -0400
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Tue Mar 6 15:51:20 2018 +0000

    libxl/arm: Fix build on arm64 + acpi
    
    With musl, the build fails with the following errors:
    
      actypes.h:202:2: error: #error unknown ACPI_MACHINE_WIDTH
       #error unknown ACPI_MACHINE_WIDTH
        ^~~~~
      actypes.h:207:9: error: unknown type name â??acpi_native_uintâ??
       typedef acpi_native_uint acpi_size;
               ^~~~~~~~~~~~~~~~
      actypes.h:617:3: error: unknown type name â??acpi_io_addressâ??
         acpi_io_address pblk_address;
         ^~~~~~~~~~~~~~~
    
    This likely went undetected with glibc builds since glibc
    indirectly pulls __BITS_PER_LONG from the linux headers
    through a standard header. For musl, this is not the case.
    
    Instead, use BITS_PER_LONG to fix the build.
    
    Signed-off-by: Daniel Sabogal <dsabogalcc@xxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    (cherry picked from commit 6657e938bf769768b56ba0c86cd4775b010538a8)
---
 tools/libxl/libxl_arm_acpi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/libxl/libxl_arm_acpi.c b/tools/libxl/libxl_arm_acpi.c
index a6456be662..636f724039 100644
--- a/tools/libxl/libxl_arm_acpi.c
+++ b/tools/libxl/libxl_arm_acpi.c
@@ -37,7 +37,7 @@ typedef int64_t s64;
 #define BITS_PER_LONG 32
 #endif
 #endif
-#define ACPI_MACHINE_WIDTH __BITS_PER_LONG
+#define ACPI_MACHINE_WIDTH BITS_PER_LONG
 #define COMPILER_DEPENDENT_INT64 int64_t
 #define COMPILER_DEPENDENT_UINT64 uint64_t
 
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.9

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