From b8e99cf12f3a287311a2d341f285c71a5da3e4d4 Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Wed, 22 Sep 2021 22:42:45 +0800
Subject: [PATCH] arch/arm: Remove -march and -mtune

since -mcpu is enough https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58869

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 arch/arm/src/armv7-m/Toolchain.defs | 6 ------
 arch/arm/src/armv8-m/Toolchain.defs | 4 ----
 2 files changed, 10 deletions(-)

diff --git a/arch/arm/src/armv7-m/Toolchain.defs b/arch/arm/src/armv7-m/Toolchain.defs
index 663e34bb5fd..cc9a2a3c6f7 100644
--- a/arch/arm/src/armv7-m/Toolchain.defs
+++ b/arch/arm/src/armv7-m/Toolchain.defs
@@ -80,8 +80,6 @@ endif
 ifeq ($(CONFIG_ARCH_CORTEXM4),y)
   TOOLCHAIN_ARM7EM   := y
   TOOLCHAIN_MCPU     := -mcpu=cortex-m4
-  TOOLCHAIN_MTUNE    := -mtune=cortex-m4
-  TOOLCHAIN_MARCH    := -march=armv7e-m
   ifeq ($(CONFIG_ARCH_FPU),y)
     TOOLCHAIN_MFLOAT := -mfpu=fpv4-sp-d16 -mfloat-abi=hard
   else
@@ -90,8 +88,6 @@ ifeq ($(CONFIG_ARCH_CORTEXM4),y)
 else ifeq ($(CONFIG_ARCH_CORTEXM7),y)
   TOOLCHAIN_ARM7EM   := y
   TOOLCHAIN_MCPU     := -mcpu=cortex-m7
-  TOOLCHAIN_MTUNE    := -mtune=cortex-m7
-  TOOLCHAIN_MARCH    := -march=armv7e-m
   ifeq ($(CONFIG_ARCH_FPU),y)
   ifeq ($(CONFIG_ARCH_DPFPU),y)
     TOOLCHAIN_MFLOAT := -mfpu=fpv5-d16 -mfloat-abi=hard
@@ -104,8 +100,6 @@ else ifeq ($(CONFIG_ARCH_CORTEXM7),y)
 else # ifeq ($(CONFIG_ARCH_CORTEXM3),y)
   TOOLCHAIN_ARM7EM   := n
   TOOLCHAIN_MCPU     := -mcpu=cortex-m3
-  TOOLCHAIN_MTUNE    := -mtune=cortex-m3
-  TOOLCHAIN_MARCH    := -march=armv7-m
   TOOLCHAIN_MFLOAT   := -mfloat-abi=soft
 endif
 
diff --git a/arch/arm/src/armv8-m/Toolchain.defs b/arch/arm/src/armv8-m/Toolchain.defs
index da50b153fbe..1448331662b 100644
--- a/arch/arm/src/armv8-m/Toolchain.defs
+++ b/arch/arm/src/armv8-m/Toolchain.defs
@@ -78,11 +78,9 @@ endif
 # Parametrization for ARCHCPUFLAGS
 ifeq ($(CONFIG_ARCH_CORTEXM23),y)
   TOOLCHAIN_MCPU     := -mcpu=cortex-m23
-  TOOLCHAIN_MARCH    := -march=armv8-m.main
   TOOLCHAIN_MFLOAT   := -mfloat-abi=soft
 else ifeq ($(CONFIG_ARCH_CORTEXM33),y)
   TOOLCHAIN_MCPU     := -mcpu=cortex-m33
-  TOOLCHAIN_MARCH    := -march=armv8-m.main+dsp
   ifeq ($(CONFIG_ARCH_FPU),y)
     TOOLCHAIN_MFLOAT := -mfpu=fpv5-sp-d16 -mfloat-abi=hard
   else
@@ -90,7 +88,6 @@ else ifeq ($(CONFIG_ARCH_CORTEXM33),y)
   endif
 else ifeq ($(CONFIG_ARCH_CORTEXM35P),y)
   TOOLCHAIN_MCPU     := -mcpu=cortex-m35p
-  TOOLCHAIN_MARCH    := -march=armv8-m.main+dsp
   ifeq ($(CONFIG_ARCH_FPU),y)
     TOOLCHAIN_MFLOAT := -mfpu=fpv5-sp-d16 -mfloat-abi=hard
   else
@@ -98,7 +95,6 @@ else ifeq ($(CONFIG_ARCH_CORTEXM35P),y)
   endif
 else ifeq ($(CONFIG_ARCH_CORTEXM55),y)
   TOOLCHAIN_MCPU     := -mcpu=cortex-m55
-  TOOLCHAIN_MARCH    := -march=armv8.1-m.main+dsp
   ifeq ($(CONFIG_ARCH_FPU),y)
     TOOLCHAIN_MFLOAT := -mfpu=fpv5-d16 -mfloat-abi=hard
   else