[Minios-devel] [UNIKRAFT PATCH 10/13] arch/arm: Rename MARCH_* of arm32 to MARCH_ARM32_*

[Wei Chen <Wei.Chen@xxxxxxx>]

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 2614425..a810257 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-$(MARCH_A20NEON)    += -mcpu=cortex-a7 -mtune=cortex-a7 -mfpu=vfpv4-d16 
-mfpu=neon-vfpv4 -funsafe-math-optimizations
-CXXFLAGS-$(MARCH_A20NEON)  += -mcpu=cortex-a7 -mtune=cortex-a7 -mfpu=vfpv4-d16 
-mfpu=neon-vfpv4 -funsafe-math-optimizations
-CFLAGS-$(MARCH_CORTEXA7)   += -mcpu=cortex-a7 -mtune=cortex-a7
-CXXFLAGS-$(MARCH_CORTEXA7) += -mcpu=cortex-a7 -mtune=cortex-a
+CFLAGS-$(MARCH_ARM32_A20NEON)    += -mcpu=cortex-a7 -mtune=cortex-a7 
-mfpu=vfpv4-d16 -mfpu=neon-vfpv4 -funsafe-math-optimizations
+CXXFLAGS-$(MARCH_ARM32_A20NEON)  += -mcpu=cortex-a7 -mtune=cortex-a7 
-mfpu=vfpv4-d16 -mfpu=neon-vfpv4 -funsafe-math-optimizations
+CFLAGS-$(MARCH_ARM32_CORTEXA7)   += -mcpu=cortex-a7 -mtune=cortex-a7
+CXXFLAGS-$(MARCH_ARM32_CORTEXA7) += -mcpu=cortex-a7 -mtune=cortex-a
 
 $(eval $(call addlib,libarmmath))
 LIBARMMATH_SRCS-$(ARCH_ARM_32) += $(UK_BASE)/arch/arm/arm/divsi3.S
-- 
2.7.4


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel