From: Daniel Sabogal Date: Fri, 25 Aug 2017 21:35:47 +0000 (-0400) Subject: libxl/arm: Fix build on arm64 + acpi X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1533 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6657e938bf769768b56ba0c86cd4775b010538a8;p=xen.git 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 Acked-by: Wei Liu --- 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