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

0xc0170 · web-flow · commit 2e964006b78f · 2021-02-02T14:18:13.000Z
CMake cores: fix cpu/fpu flags
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()
 

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")`
`6`	`6`	`list(APPEND common_options`
`7`	`7`	`"-mthumb"`
	`8`	`+ "-mcpu=cortex-m1"`
`8`	`9`	`)`
`9`	`10`	`elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")`
`10`	`11`	`list(APPEND common_options`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")`
`6`	`6`	`list(APPEND common_options`
`7`	`7`	`"-mthumb"`
`8`	`8`	`"-mcpu=cortex-m33+nodsp"`
`9`		`- "-march=armv8-m.main"`
	`9`	`+ "-mfpu=none"`
`10`	`10`	`)`
`11`	`11`	`elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")`
`12`	`12`	`list(APPEND common_options`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")`
`11`	`11`	`)`
`12`	`12`	`elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")`
`13`	`13`	`list(APPEND common_options`
`14`		`- "-mcpu=cortex-m7"`
`15`	`14`	`"-mfpu=fpv5-sp-d16"`
`16`	`15`	`"-mfloat-abi=hard"`
	`16`	`+ "-mcpu=cortex-m7"`
`17`	`17`	`)`
`18`	`18`	`endif()`
`19`	`19`