Re: [XEN PATCH v8 20/47] build: add headers path to CFLAGS once for all archs

[Julien Grall <julien@xxxxxxx>]

Hi Anthony,

On 25/11/2021 13:39, Anthony PERARD wrote:
> This just remove duplication.
>
> Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
> Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
For Arm:

Acked-by: Julien Grall <jgrall@xxxxxxxxxx>

Cheers,

> ---
>   xen/Makefile           | 3 +++
>   xen/arch/arm/arch.mk   | 3 ---
>   xen/arch/riscv/arch.mk | 2 --
>   xen/arch/x86/arch.mk   | 2 --
>   4 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/xen/Makefile b/xen/Makefile
> index 06d5e4fd61c1..efd7538099f3 100644
> --- a/xen/Makefile
> +++ b/xen/Makefile
> @@ -312,6 +312,9 @@ CFLAGS += -flto
>   LDFLAGS-$(CONFIG_CC_IS_CLANG) += -plugin LLVMgold.so
>   endif
>   
> +CFLAGS += -I$(srctree)/include
> +CFLAGS += -I$(srctree)/arch/$(TARGET_ARCH)/include
> +
>   # Note that link order matters!
>   ALL_OBJS-y                := common/built_in.o
>   ALL_OBJS-y                += drivers/built_in.o
> diff --git a/xen/arch/arm/arch.mk b/xen/arch/arm/arch.mk
> index 4e3f7014305e..094b67072304 100644
> --- a/xen/arch/arm/arch.mk
> +++ b/xen/arch/arm/arch.mk
> @@ -1,9 +1,6 @@
>   ########################################
>   # arm-specific definitions
>   
> -CFLAGS += -I$(srctree)/include
> -CFLAGS += -I$(srctree)/arch/$(TARGET_ARCH)/include
> -
>   $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS))
>   $(call cc-option-add,CFLAGS,CC,-Wnested-externs)
>   
> diff --git a/xen/arch/riscv/arch.mk b/xen/arch/riscv/arch.mk
> index 694ba053ceab..ae8fe9dec730 100644
> --- a/xen/arch/riscv/arch.mk
> +++ b/xen/arch/riscv/arch.mk
> @@ -11,5 +11,3 @@ riscv-march-$(CONFIG_RISCV_ISA_C)       := $(riscv-march-y)c
>   # -mcmodel=medlow would force Xen into the lower half.
>   
>   CFLAGS += -march=$(riscv-march-y) -mstrict-align -mcmodel=medany
> -CFLAGS += -I$(srctree)/include
> -CFLAGS += -I$(srctree)/arch/$(TARGET_ARCH)/include
> diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk
> index 5152de343082..1ba488d645c0 100644
> --- a/xen/arch/x86/arch.mk
> +++ b/xen/arch/x86/arch.mk
> @@ -3,8 +3,6 @@
>   
>   export XEN_IMG_OFFSET := 0x200000
>   
> -CFLAGS += -I$(srctree)/include
> -CFLAGS += -I$(srctree)/arch/$(TARGET_ARCH)/include
>   CFLAGS += -I$(srctree)/arch/x86/include/asm/mach-generic
>   CFLAGS += -I$(srctree)/arch/x86/include/asm/mach-default
>   CFLAGS += -DXEN_IMG_OFFSET=$(XEN_IMG_OFFSET)
--
Julien Grall