Skip to content

Commit 0a990e7

Browse files
committed
CMake cores: align fpu settings
Move the fpu settings across all cores so they are aligned. Some cores did not have fpu set for ARMClang. I matched here both toolchains to set up the fpu the same (Only exception is soft vs hard - that is separate issue I would not like to touch in this series).
1 parent 8e2c957 commit 0a990e7

File tree

9 files changed

+12
-4
lines changed

9 files changed

+12
-4
lines changed

tools/cmake/cores/Cortex-A9.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
1212
)
1313
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
1414
list(APPEND common_options
15+
"-mfpu=vfpv3"
16+
"-mfloat-abi=hard"
1517
"-mcpu=cortex-a9"
1618
)
1719
endif()

tools/cmake/cores/Cortex-M33-NS.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
66
list(APPEND common_options
77
"-mthumb"
88
"-mcpu=cortex-m33+nodsp"
9+
"-mfpu=none"
910
)
1011
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
1112
list(APPEND common_options

tools/cmake/cores/Cortex-M33.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
66
list(APPEND common_options
77
"-mthumb"
88
"-mcpu=cortex-m33+nodsp"
9+
"-mfpu=none"
910
)
1011
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
1112
list(APPEND common_options

tools/cmake/cores/Cortex-M33F-NS.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
1111
)
1212
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
1313
list(APPEND common_options
14-
"-mcpu=cortex-m33+nodsp"
1514
"-mfpu=fpv5-sp-d16"
1615
"-mfloat-abi=hard"
16+
"-mcpu=cortex-m33+nodsp"
1717
)
1818
endif()
1919

tools/cmake/cores/Cortex-M33F.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
1111
)
1212
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
1313
list(APPEND common_options
14-
"-mcpu=cortex-m33+nodsp"
1514
"-mfpu=fpv5-sp-d16"
1615
"-mfloat-abi=hard"
16+
"-mcpu=cortex-m33+nodsp"
1717
)
1818
endif()
1919

tools/cmake/cores/Cortex-M33FE-NS.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
1111
)
1212
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
1313
list(APPEND common_options
14+
"-mfpu=fpv5-sp-d16"
15+
"-mfloat-abi=hard"
1416
"-mcpu=cortex-m33+dsp"
1517
)
1618
endif()

tools/cmake/cores/Cortex-M33FE.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
1111
)
1212
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
1313
list(APPEND common_options
14+
"-mfpu=fpv5-sp-d16"
15+
"-mfloat-abi=hard"
1416
"-mcpu=cortex-m33+dsp"
1517
)
1618
endif()

tools/cmake/cores/Cortex-M7F.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
1111
)
1212
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
1313
list(APPEND common_options
14-
"-mcpu=cortex-m7"
1514
"-mfpu=fpv5-sp-d16"
1615
"-mfloat-abi=hard"
16+
"-mcpu=cortex-m7"
1717
)
1818
endif()
1919

tools/cmake/cores/Cortex-M7FD.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
1111
)
1212
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
1313
list(APPEND common_options
14-
"-mcpu=cortex-m7"
1514
"-mfpu=fpv5-d16"
1615
"-mfloat-abi=hard"
16+
"-mcpu=cortex-m7"
1717
)
1818
endif()
1919

0 commit comments

Comments
 (0)