Re: [Minios-devel] [UNIKRAFT PATCHv4 10/43] arch/arm: Rename MARCH_* of arm32 to MARCH_ARM32_*

[Simon Kuenzer <simon.kuenzer@xxxxxxxxx>]

Reviewed-by: Simon Kuenzer <simon.kuenzer@xxxxxxxxx>

On 06.07.2018 11:03, Wei Chen wrote:
> Add architecture name to the processor macros. This will avoid the
> name conflict of different architectures. For instance, both arm32
> and arm64 have "generic" option for select processors. If we don't
> add architecture name to the macros. Both of these "generic" option
> will generate a macro: MARCH_GENERIC. In this case, the build scripts
> can't distinguish between arm32/generic and arm32/generic
>
> Signed-off-by: Wei Chen <Wei.Chen@xxxxxxx>
> ---
>   arch/arm/arm/Config.uk   | 6 +++---
>   arch/arm/arm/Makefile.uk | 8 ++++----
>   2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/arm/Config.uk b/arch/arm/arm/Config.uk
> index 426c113..8b4deab 100644
> --- a/arch/arm/arm/Config.uk
> +++ b/arch/arm/arm/Config.uk
> @@ -1,15 +1,15 @@
>   choice
>         prompt "Processor Optimization"
> -       default MARCH_CORTEXA7
> +       default MARCH_ARM32_CORTEXA7
>         help
>                 Optimize the code for selected target processor
>   
> -config MARCH_CORTEXA7
> +config MARCH_ARM32_CORTEXA7
>         bool "Generic Cortex A7"
>         help
>                 Compile for Cortex-A7 CPUs, no hardware FPU support
>   
> -config MARCH_A20NEON
> +config MARCH_ARM32_A20NEON
>         bool "Cortex A7: AllWinner A20"
>         help
>                 Compile for AllWinner A20 (Cortex-A7) CPUs
> diff --git a/arch/arm/arm/Makefile.uk b/arch/arm/arm/Makefile.uk
> index b746f70..a84f2b8 100644
> --- a/arch/arm/arm/Makefile.uk
> +++ b/arch/arm/arm/Makefile.uk
> @@ -7,10 +7,10 @@ CXXFLAGS += -marm -fms-extensions
>   
>   #-march=armv7-a
>   
> -CFLAGS-$(CONFIG_MARCH_A20NEON)    += -mcpu=cortex-a7 -mtune=cortex-a7 -mfpu=vfpv4-d16 -mfpu=neon-vfpv4 -funsafe-math-optimizations
> -CXXFLAGS-$(CONFIG_MARCH_A20NEON)  += -mcpu=cortex-a7 -mtune=cortex-a7 
> -mfpu=vfpv4-d16 -mfpu=neon-vfpv4 -funsafe-math-optimizations
> -CFLAGS-$(CONFIG_MARCH_CORTEXA7)   += -mcpu=cortex-a7 -mtune=cortex-a7
> -CXXFLAGS-$(CONFIG_MARCH_CORTEXA7) += -mcpu=cortex-a7 -mtune=cortex-a
> +CFLAGS-$(CONFIG_MARCH_ARM32_A20NEON)    += -mcpu=cortex-a7 -mtune=cortex-a7 
> -mfpu=vfpv4-d16 -mfpu=neon-vfpv4 -funsafe-math-optimizations
> +CXXFLAGS-$(CONFIG_MARCH_ARM32_A20NEON)  += -mcpu=cortex-a7 -mtune=cortex-a7 
> -mfpu=vfpv4-d16 -mfpu=neon-vfpv4 -funsafe-math-optimizations
> +CFLAGS-$(CONFIG_MARCH_ARM32_CORTEXA7)   += -mcpu=cortex-a7 -mtune=cortex-a7
> +CXXFLAGS-$(CONFIG_MARCH_ARM32_CORTEXA7) += -mcpu=cortex-a7 -mtune=cortex-a
>   
>   $(eval $(call addlib,libarmmath))
>   LIBARMMATH_SRCS-$(CONFIG_ARCH_ARM_32) += $(CONFIG_UK_BASE)/arch/arm/divsi3.S
_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel