Merge pull request ARMmbed#14196 from 0xc0170/fix-cores-gcc

CMake cores: fix cpu/fpu flags
lhespress · Feb 2, 2021 · 2e96400 · 2e96400
2 parents 276e835 + 0a990e7
commit 2e96400
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 13 deletions.
diff --git a/tools/cmake/cores/Cortex-A9.cmake b/tools/cmake/cores/Cortex-A9.cmake
@@ -5,13 +5,15 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     list(APPEND common_options
         "-mthumb-interwork"
         "-marm"
-        "-march=armv7-a"
         "-mfpu=vfpv3"
         "-mfloat-abi=hard"
         "-mno-unaligned-access"
+        "-mcpu=cortex-a9"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     list(APPEND common_options
+        "-mfpu=vfpv3"
+        "-mfloat-abi=hard"
         "-mcpu=cortex-a9"
     )
 endif()

diff --git a/tools/cmake/cores/Cortex-M1.cmake b/tools/cmake/cores/Cortex-M1.cmake
@@ -5,6 +5,7 @@
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     list(APPEND common_options
         "-mthumb"
+        "-mcpu=cortex-m1"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     list(APPEND common_options

diff --git a/tools/cmake/cores/Cortex-M23-NS.cmake b/tools/cmake/cores/Cortex-M23-NS.cmake
@@ -5,6 +5,7 @@
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     list(APPEND common_options
         "-mthumb"
+        "-mcpu=cortex-m23"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     list(APPEND common_options

diff --git a/tools/cmake/cores/Cortex-M23.cmake b/tools/cmake/cores/Cortex-M23.cmake
@@ -5,6 +5,7 @@
 if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     list(APPEND common_options
         "-mthumb"
+        "-mcpu=cortex-m23"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     list(APPEND common_options

diff --git a/tools/cmake/cores/Cortex-M33-NS.cmake b/tools/cmake/cores/Cortex-M33-NS.cmake
@@ -6,7 +6,7 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     list(APPEND common_options
         "-mthumb"
         "-mcpu=cortex-m33+nodsp"
-        "-march=armv8-m.main"
+        "-mfpu=none"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     list(APPEND common_options

diff --git a/tools/cmake/cores/Cortex-M33.cmake b/tools/cmake/cores/Cortex-M33.cmake
@@ -6,7 +6,7 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     list(APPEND common_options
         "-mthumb"
         "-mcpu=cortex-m33+nodsp"
-        "-march=armv8-m.main"
+        "-mfpu=none"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     list(APPEND common_options

diff --git a/tools/cmake/cores/Cortex-M33F-NS.cmake b/tools/cmake/cores/Cortex-M33F-NS.cmake
@@ -7,13 +7,13 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
         "-mthumb"
         "-mfpu=fpv5-sp-d16"
         "-mfloat-abi=softfp"
-        "-march=armv8-m.main"
+        "-mcpu=cortex-m33+nodsp"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     list(APPEND common_options
-        "-mcpu=cortex-m33+nodsp"
         "-mfpu=fpv5-sp-d16"
         "-mfloat-abi=hard"
+        "-mcpu=cortex-m33+nodsp"
     )
 endif()
 

diff --git a/tools/cmake/cores/Cortex-M33F.cmake b/tools/cmake/cores/Cortex-M33F.cmake
@@ -7,13 +7,13 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
         "-mthumb"
         "-mfpu=fpv5-sp-d16"
         "-mfloat-abi=softfp"
-        "-march=armv8-m.main"
+        "-mcpu=cortex-m33+nodsp"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     list(APPEND common_options
-        "-mcpu=cortex-m33+nodsp"
         "-mfpu=fpv5-sp-d16"
         "-mfloat-abi=hard"
+        "-mcpu=cortex-m33+nodsp"
     )
 endif()
 

diff --git a/tools/cmake/cores/Cortex-M33FE-NS.cmake b/tools/cmake/cores/Cortex-M33FE-NS.cmake
@@ -7,11 +7,13 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
         "-mthumb"
         "-mfpu=fpv5-sp-d16"
         "-mfloat-abi=softfp"
-        "-march=armv8-m.main+dsp"
+        "-mcpu=cortex-m33"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     list(APPEND common_options
-        "-mcpu=cortex-m33"
+        "-mfpu=fpv5-sp-d16"
+        "-mfloat-abi=hard"
+        "-mcpu=cortex-m33+dsp"
     )
 endif()
 

diff --git a/tools/cmake/cores/Cortex-M33FE.cmake b/tools/cmake/cores/Cortex-M33FE.cmake
@@ -7,11 +7,13 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
         "-mthumb"
         "-mfpu=fpv5-sp-d16"
         "-mfloat-abi=softfp"
-        "-march=armv8-m.main+dsp"
+        "-mcpu=cortex-m33"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     list(APPEND common_options
-        "-mcpu=cortex-m33"
+        "-mfpu=fpv5-sp-d16"
+        "-mfloat-abi=hard"
+        "-mcpu=cortex-m33+dsp"
     )
 endif()
 

diff --git a/tools/cmake/cores/Cortex-M7F.cmake b/tools/cmake/cores/Cortex-M7F.cmake
@@ -11,9 +11,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     list(APPEND common_options
-        "-mcpu=cortex-m7"
         "-mfpu=fpv5-sp-d16"
         "-mfloat-abi=hard"
+        "-mcpu=cortex-m7"
     )
 endif()
 

diff --git a/tools/cmake/cores/Cortex-M7FD.cmake b/tools/cmake/cores/Cortex-M7FD.cmake
@@ -11,9 +11,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
     list(APPEND common_options
-        "-mcpu=cortex-m7"
         "-mfpu=fpv5-d16"
         "-mfloat-abi=hard"
+        "-mcpu=cortex-m7"
     )
 endif()