Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 07:12:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "arch/armv8-m: use -mfpu=auto based on -mcpu=cortex-m55"

Browse Source 
This reverts commit d9a5b92c1a.

Revert "arch/arm: Remove -march and -mtune"

This reverts commit b8e99cf12f.
This commit is contained in:
ligd
2021-10-22 22:10:15 +08:00
committed by Xiang Xiao
parent 3615592e82
commit 8417b4726b
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/armv7-m/Toolchain.defs
+6
View File
@@ -80,6 +80,8 @@ endif
ifeq ($(CONFIG_ARCH_CORTEXM4),y) ifeq ($(CONFIG_ARCH_CORTEXM4),y)
TOOLCHAIN_ARM7EM := y TOOLCHAIN_ARM7EM := y
TOOLCHAIN_MCPU := -mcpu=cortex-m4 TOOLCHAIN_MCPU := -mcpu=cortex-m4
TOOLCHAIN_MTUNE := -mtune=cortex-m4
TOOLCHAIN_MARCH := -march=armv7e-m
ifeq ($(CONFIG_ARCH_FPU),y) ifeq ($(CONFIG_ARCH_FPU),y)
TOOLCHAIN_MFLOAT := -mfpu=fpv4-sp-d16 -mfloat-abi=hard TOOLCHAIN_MFLOAT := -mfpu=fpv4-sp-d16 -mfloat-abi=hard
else else
@@ -88,6 +90,8 @@ ifeq ($(CONFIG_ARCH_CORTEXM4),y)
else ifeq ($(CONFIG_ARCH_CORTEXM7),y) else ifeq ($(CONFIG_ARCH_CORTEXM7),y)
TOOLCHAIN_ARM7EM := y TOOLCHAIN_ARM7EM := y
TOOLCHAIN_MCPU := -mcpu=cortex-m7 TOOLCHAIN_MCPU := -mcpu=cortex-m7
TOOLCHAIN_MTUNE := -mtune=cortex-m7
TOOLCHAIN_MARCH := -march=armv7e-m
ifeq ($(CONFIG_ARCH_FPU),y) ifeq ($(CONFIG_ARCH_FPU),y)
ifeq ($(CONFIG_ARCH_DPFPU),y) ifeq ($(CONFIG_ARCH_DPFPU),y)
TOOLCHAIN_MFLOAT := -mfpu=fpv5-d16 -mfloat-abi=hard TOOLCHAIN_MFLOAT := -mfpu=fpv5-d16 -mfloat-abi=hard
@@ -100,6 +104,8 @@ else ifeq ($(CONFIG_ARCH_CORTEXM7),y)
else # ifeq ($(CONFIG_ARCH_CORTEXM3),y) else # ifeq ($(CONFIG_ARCH_CORTEXM3),y)
TOOLCHAIN_ARM7EM := n TOOLCHAIN_ARM7EM := n
TOOLCHAIN_MCPU := -mcpu=cortex-m3 TOOLCHAIN_MCPU := -mcpu=cortex-m3
TOOLCHAIN_MTUNE := -mtune=cortex-m3
TOOLCHAIN_MARCH := -march=armv7-m
TOOLCHAIN_MFLOAT := -mfloat-abi=soft TOOLCHAIN_MFLOAT := -mfloat-abi=soft
endif endif
arch/arm/src/armv8-m/Toolchain.defs
+4
View File
@@ -78,9 +78,11 @@ endif
# Parametrization for ARCHCPUFLAGS # Parametrization for ARCHCPUFLAGS
ifeq ($(CONFIG_ARCH_CORTEXM23),y) ifeq ($(CONFIG_ARCH_CORTEXM23),y)
TOOLCHAIN_MCPU := -mcpu=cortex-m23 TOOLCHAIN_MCPU := -mcpu=cortex-m23
TOOLCHAIN_MARCH := -march=armv8-m.main
TOOLCHAIN_MFLOAT := -mfloat-abi=soft TOOLCHAIN_MFLOAT := -mfloat-abi=soft
else ifeq ($(CONFIG_ARCH_CORTEXM33),y) else ifeq ($(CONFIG_ARCH_CORTEXM33),y)
TOOLCHAIN_MCPU := -mcpu=cortex-m33 TOOLCHAIN_MCPU := -mcpu=cortex-m33
TOOLCHAIN_MARCH := -march=armv8-m.main+dsp
ifeq ($(CONFIG_ARCH_FPU),y) ifeq ($(CONFIG_ARCH_FPU),y)
TOOLCHAIN_MFLOAT := -mfpu=fpv5-sp-d16 -mfloat-abi=hard TOOLCHAIN_MFLOAT := -mfpu=fpv5-sp-d16 -mfloat-abi=hard
else else
@@ -88,6 +90,7 @@ else ifeq ($(CONFIG_ARCH_CORTEXM33),y)
endif endif
else ifeq ($(CONFIG_ARCH_CORTEXM35P),y) else ifeq ($(CONFIG_ARCH_CORTEXM35P),y)
TOOLCHAIN_MCPU := -mcpu=cortex-m35p TOOLCHAIN_MCPU := -mcpu=cortex-m35p
TOOLCHAIN_MARCH := -march=armv8-m.main+dsp
ifeq ($(CONFIG_ARCH_FPU),y) ifeq ($(CONFIG_ARCH_FPU),y)
TOOLCHAIN_MFLOAT := -mfpu=fpv5-sp-d16 -mfloat-abi=hard TOOLCHAIN_MFLOAT := -mfpu=fpv5-sp-d16 -mfloat-abi=hard
else else
@@ -95,6 +98,7 @@ else ifeq ($(CONFIG_ARCH_CORTEXM35P),y)
endif endif
else ifeq ($(CONFIG_ARCH_CORTEXM55),y) else ifeq ($(CONFIG_ARCH_CORTEXM55),y)
TOOLCHAIN_MCPU := -mcpu=cortex-m55 TOOLCHAIN_MCPU := -mcpu=cortex-m55
TOOLCHAIN_MARCH := -march=armv8.1-m.main+dsp
ifeq ($(CONFIG_ARCH_FPU),y) ifeq ($(CONFIG_ARCH_FPU),y)
TOOLCHAIN_MFLOAT := -mfpu=fpv5-d16 -mfloat-abi=hard TOOLCHAIN_MFLOAT := -mfpu=fpv5-d16 -mfloat-abi=hard
else else