diff --git a/cmake/cores/Cortex-A9.cmake b/cmake/cores/Cortex-A9.cmake
index 70af83394b..43b28ca648 100644
--- a/cmake/cores/Cortex-A9.cmake
+++ b/cmake/cores/Cortex-A9.cmake
@@ -30,7 +30,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
 elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
-    --cpu=Cortex-A9 \
+    -mcpu=cortex-a9 \
 ")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
@@ -40,10 +40,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
     ${ARM_FLAGS} \
 ")
 set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-A9 \
 ")
 set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-A9 \
 ")
 
 endif()
diff --git a/cmake/cores/Cortex-M0+.cmake b/cmake/cores/Cortex-M0+.cmake
index 383d41fd5c..5c10cc6fda 100644
--- a/cmake/cores/Cortex-M0+.cmake
+++ b/cmake/cores/Cortex-M0+.cmake
@@ -26,7 +26,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
 elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
-    --cpu=Cortex-M0plus \
+    -mcpu=cortex-m0plus \
 ")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
@@ -36,10 +36,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
     ${ARM_FLAGS} \
 ")
 set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M0plus \
 ")
 set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M0plus \
 ")
 
 endif()
diff --git a/cmake/cores/Cortex-M0.cmake b/cmake/cores/Cortex-M0.cmake
index df0abb8bc9..7f4ec181e6 100644
--- a/cmake/cores/Cortex-M0.cmake
+++ b/cmake/cores/Cortex-M0.cmake
@@ -25,7 +25,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
 elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
-    --cpu=Cortex-M0 \
+    -mcpu=cortex-m0 \
 ")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
@@ -35,10 +35,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
     ${ARM_FLAGS} \
 ")
 set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M0 \
 ")
 set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M0 \
 ")
 
 endif()
diff --git a/cmake/cores/Cortex-M1.cmake b/cmake/cores/Cortex-M1.cmake
index f90be82480..af811c648e 100644
--- a/cmake/cores/Cortex-M1.cmake
+++ b/cmake/cores/Cortex-M1.cmake
@@ -25,7 +25,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
 elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
-    --cpu=Cortex-M1 \
+    -mcpu=cortex-m1 \
 ")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
@@ -35,10 +35,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
     ${ARM_FLAGS} \
 ")
 set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M1 \
 ")
 set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M1 \
 ")
 
 endif()
diff --git a/cmake/cores/Cortex-M23-NS.cmake b/cmake/cores/Cortex-M23-NS.cmake
index d7d4f1be40..6c4753bf6a 100644
--- a/cmake/cores/Cortex-M23-NS.cmake
+++ b/cmake/cores/Cortex-M23-NS.cmake
@@ -25,7 +25,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
 elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
-    --cpu=Cortex-M23 \
+    -mcpu=cortex-m23 \
 ")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
@@ -35,10 +35,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
     ${ARM_FLAGS} \
 ")
 set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M23 \
 ")
 set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M23 \
 ")
 
 endif()
diff --git a/cmake/cores/Cortex-M23.cmake b/cmake/cores/Cortex-M23.cmake
index 96c12ac6e9..41a187bb16 100644
--- a/cmake/cores/Cortex-M23.cmake
+++ b/cmake/cores/Cortex-M23.cmake
@@ -25,7 +25,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
 elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
-    --cpu=Cortex-M23 \
+    -mcpu=cortex-m23 \
 ")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
@@ -35,10 +35,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
     ${ARM_FLAGS} \
 ")
 set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M23 \
 ")
 set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M23 \
 ")
 
 endif()
diff --git a/cmake/cores/Cortex-M3.cmake b/cmake/cores/Cortex-M3.cmake
index 36069ee850..008939b8b0 100644
--- a/cmake/cores/Cortex-M3.cmake
+++ b/cmake/cores/Cortex-M3.cmake
@@ -25,7 +25,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
 elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
-    --cpu=Cortex-M3 \
+    -mcpu=cortex-m3 \
 ")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
@@ -35,10 +35,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
     ${ARM_FLAGS} \
 ")
 set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M3 \
 ")
 set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M3 \
 ")
 
 endif()
diff --git a/cmake/cores/Cortex-M33-NS.cmake b/cmake/cores/Cortex-M33-NS.cmake
index 60593c1ed2..56675f6772 100644
--- a/cmake/cores/Cortex-M33-NS.cmake
+++ b/cmake/cores/Cortex-M33-NS.cmake
@@ -26,7 +26,8 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
 elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
-    --cpu=Cortex-M33 \
+    -mcpu=cortex-m33+nodsp \
+    -mfpu=none \
 ")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
@@ -36,10 +37,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
     ${ARM_FLAGS} \
 ")
 set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M33.no_dsp.no_fp \
 ")
 set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M33.no_dsp.no_fp \
 ")
 
 endif()
diff --git a/cmake/cores/Cortex-M33.cmake b/cmake/cores/Cortex-M33.cmake
index d9c7ba7b73..7098d8e0e7 100644
--- a/cmake/cores/Cortex-M33.cmake
+++ b/cmake/cores/Cortex-M33.cmake
@@ -26,7 +26,8 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
 elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
-    --cpu=Cortex-M33 \
+    -mcpu=cortex-m33+nodsp \
+    -mfpu=none \
 ")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
@@ -36,10 +37,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
     ${ARM_FLAGS} \
 ")
 set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M33.no_dsp.no_fp \
 ")
 set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M33.no_dsp.no_fp \
 ")
 
 endif()
diff --git a/cmake/cores/Cortex-M33F-NS.cmake b/cmake/cores/Cortex-M33F-NS.cmake
index 3724570b7f..b509486227 100644
--- a/cmake/cores/Cortex-M33F-NS.cmake
+++ b/cmake/cores/Cortex-M33F-NS.cmake
@@ -28,7 +28,9 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
 elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
-    --cpu=Cortex-M33F \
+    -mcpu=cortex-m33+nodsp \
+    -mfpu=fpv5-sp-d16 \
+    -mfloat-abi=hard \
 ")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
@@ -38,10 +40,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
     ${ARM_FLAGS} \
 ")
 set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M33.no_dsp \
 ")
 set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M33.no_dsp \
 ")
 
 endif()
diff --git a/cmake/cores/Cortex-M33F.cmake b/cmake/cores/Cortex-M33F.cmake
index ba5c46e733..b537df9654 100644
--- a/cmake/cores/Cortex-M33F.cmake
+++ b/cmake/cores/Cortex-M33F.cmake
@@ -28,7 +28,9 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
 elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
-    --cpu=Cortex-M33F \
+    -mcpu=cortex-m33+nodsp \
+    -mfpu=fpv5-sp-d16 \
+    -mfloat-abi=hard \
 ")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
@@ -38,10 +40,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
     ${ARM_FLAGS} \
 ")
 set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M33.no_dsp \
 ")
 set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M33.no_dsp \
 ")
 
 endif()
diff --git a/cmake/cores/Cortex-M33FE-NS.cmake b/cmake/cores/Cortex-M33FE-NS.cmake
index 0fb5619f0c..d67fcf3c47 100644
--- a/cmake/cores/Cortex-M33FE-NS.cmake
+++ b/cmake/cores/Cortex-M33FE-NS.cmake
@@ -28,7 +28,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
 elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
-    --cpu=Cortex-M33FE \
+    -mcpu=cortex-m33 \
 ")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
@@ -38,10 +38,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
     ${ARM_FLAGS} \
 ")
 set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M33 \
 ")
 set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M33 \
 ")
 
 endif()
diff --git a/cmake/cores/Cortex-M33FE.cmake b/cmake/cores/Cortex-M33FE.cmake
index 0b35000a1b..1f216e0572 100644
--- a/cmake/cores/Cortex-M33FE.cmake
+++ b/cmake/cores/Cortex-M33FE.cmake
@@ -28,7 +28,7 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
 elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
-    --cpu=Cortex-M33FE \
+    -mcpu=cortex-m33 \
 ")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
@@ -38,10 +38,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
     ${ARM_FLAGS} \
 ")
 set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M33 \
 ")
 set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M33 \
 ")
 
 endif()
diff --git a/cmake/cores/Cortex-M4.cmake b/cmake/cores/Cortex-M4.cmake
index 9f6251e468..bef42c0c95 100644
--- a/cmake/cores/Cortex-M4.cmake
+++ b/cmake/cores/Cortex-M4.cmake
@@ -26,7 +26,8 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
 elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
-    --cpu=Cortex-M4 \
+    -mcpu=cortex-m4 \
+    -mfpu=none \
 ")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
@@ -36,10 +37,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
     ${ARM_FLAGS} \
 ")
 set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M4.no_fp \
 ")
 set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M4.no_fp \
 ")
 
 endif()
diff --git a/cmake/cores/Cortex-M7.cmake b/cmake/cores/Cortex-M7.cmake
index 147363482c..54f831cea8 100644
--- a/cmake/cores/Cortex-M7.cmake
+++ b/cmake/cores/Cortex-M7.cmake
@@ -26,7 +26,8 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
 elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
-    --cpu=Cortex-M7 \
+    -mcpu=cortex-m7 \
+    -mfpu=none \
 ")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
@@ -36,10 +37,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
     ${ARM_FLAGS} \
 ")
 set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M7.no_fp \
 ")
 set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M7.no_fp \
 ")
 
 endif()
diff --git a/cmake/cores/Cortex-M7F.cmake b/cmake/cores/Cortex-M7F.cmake
index 437af840ef..63a5b648a9 100644
--- a/cmake/cores/Cortex-M7F.cmake
+++ b/cmake/cores/Cortex-M7F.cmake
@@ -28,7 +28,9 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
 elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
-    --cpu=Cortex-M7.fp.sp \
+    -mcpu=cortex-m7 \
+    -mfpu=fpv5-sp-d16 \
+    -mfloat-abi=hard \
 ")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
@@ -38,10 +40,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
     ${ARM_FLAGS} \
 ")
 set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M7.fp.sp \
 ")
 set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M7.fp.sp \
 ")
 
 endif()
diff --git a/cmake/cores/Cortex-M7FD.cmake b/cmake/cores/Cortex-M7FD.cmake
index 8943295d9f..74d6d941fa 100644
--- a/cmake/cores/Cortex-M7FD.cmake
+++ b/cmake/cores/Cortex-M7FD.cmake
@@ -28,7 +28,9 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
 elseif(MBED_TOOLCHAIN STREQUAL "ARM")
 
 set(ARM_FLAGS " \
-    --cpu=Cortex-M7.fp.dp \
+    -mcpu=cortex-m7 \
+    -mfpu=fpv5-d16 \
+    -mfloat-abi=hard \
 ")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
@@ -38,10 +40,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
     ${ARM_FLAGS} \
 ")
 set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M7 \
 ")
 set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
-    ${ARM_FLAGS} \
+    --cpu=Cortex-M7 \
 ")
 
 endif()