Re: [Xen-devel] [PATCH for-4.8] tools/libacpi: Fix compilation when cross building the tools

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 25.11.16 at 20:06, <julien.grall@xxxxxxx> wrote:
> --- a/tools/libacpi/Makefile
> +++ b/tools/libacpi/Makefile
> @@ -27,6 +27,11 @@ DSDT_FILES ?= $(C_SRC-y)
>  C_SRC = $(addprefix $(ACPI_BUILD_DIR)/, $(DSDT_FILES))
>  H_SRC = $(addprefix $(ACPI_BUILD_DIR)/, ssdt_s3.h ssdt_s4.h ssdt_pm.h 
> ssdt_tpm.h)
>  
> +MKDSDT_CFLAGS-$(CONFIG_ARM_64) = -DCONFIG_ARM_64
> +MKDSDT_CFLAGS-$(CONFIG_X86) = -DCONFIG_X86
> +
> +MKDSDT_CFLAGS = $(MKDSDT_CFLAGS-y)

On top of what Andrew has said, I don't think this variable is really
needed at this point anyway. Simply use the -y tagged one below
right away.

> --- a/tools/libacpi/mk_dsdt.c
> +++ b/tools/libacpi/mk_dsdt.c
> @@ -17,9 +17,9 @@
>  #include <getopt.h>
>  #include <stdlib.h>
>  #include <stdbool.h>
> -#if defined(__i386__) || defined(__x86_64__)
> +#ifdef CONFIG_X86
>  #include <xen/hvm/hvm_info_table.h>
> -#elif defined(__aarch64__)
> +#elif CONFIG_ARM_64

#elif defined()

Also, for thing to look consistent, please also use #if defined()
in favor of #ifdef then (unless, like in a few cases further down)
there's no such "else".

Jan


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