diff --git a/tools/cmake/cores/Cortex-A9.cmake b/tools/cmake/cores/Cortex-A9.cmake
index 998b47a8bd5..81137315f2f 100644
--- a/tools/cmake/cores/Cortex-A9.cmake
+++ b/tools/cmake/cores/Cortex-A9.cmake
@@ -11,15 +11,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
         "-mno-unaligned-access"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    list(APPEND c_cxx_compile_options
+    list(APPEND common_options
         "-mcpu=cortex-a9"
     )
-    list(APPEND asm_compile_options
-        "-mcpu=Cortex-A9"
-    )
-    list(APPEND link_options
-        "--cpu=Cortex-A9"
-    )
 endif()
 
 function(mbed_set_cpu_core_definitions target)
diff --git a/tools/cmake/cores/Cortex-M0+.cmake b/tools/cmake/cores/Cortex-M0+.cmake
index 711bd14c095..7756a485b53 100644
--- a/tools/cmake/cores/Cortex-M0+.cmake
+++ b/tools/cmake/cores/Cortex-M0+.cmake
@@ -8,15 +8,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
         "-mcpu=cortex-m0plus"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    list(APPEND c_cxx_compile_options
+    list(APPEND common_options
         "-mcpu=cortex-m0plus"
     )
-    list(APPEND asm_compile_options
-        "-mcpu=Cortex-M0plus"
-    )
-    list(APPEND link_options
-        "--cpu=Cortex-M0plus"
-    )
 endif()
 
 function(mbed_set_cpu_core_definitions target)
diff --git a/tools/cmake/cores/Cortex-M0.cmake b/tools/cmake/cores/Cortex-M0.cmake
index 68d00b726a4..56ec0e4181c 100644
--- a/tools/cmake/cores/Cortex-M0.cmake
+++ b/tools/cmake/cores/Cortex-M0.cmake
@@ -8,15 +8,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
         "-mcpu=cortex-m0"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    list(APPEND c_cxx_compile_options
+    list(APPEND common_options
         "-mcpu=cortex-m0"
     )
-    list(APPEND asm_compile_options
-        "-mcpu=Cortex-M0"
-    )
-    list(APPEND link_options
-        "--cpu=Cortex-M0"
-    )
 endif()
 
 function(mbed_set_cpu_core_definitions target)
diff --git a/tools/cmake/cores/Cortex-M1.cmake b/tools/cmake/cores/Cortex-M1.cmake
index cce13c24b74..ded1973def2 100644
--- a/tools/cmake/cores/Cortex-M1.cmake
+++ b/tools/cmake/cores/Cortex-M1.cmake
@@ -7,15 +7,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
         "-mthumb"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    list(APPEND c_cxx_compile_options
+    list(APPEND common_options
         "-mcpu=cortex-m1"
     )
-    list(APPEND asm_compile_options
-        "-mcpu=Cortex-M1"
-    )
-    list(APPEND link_options
-        "--cpu=Cortex-M1"
-    )
 endif()
 
 function(mbed_set_cpu_core_definitions target)
diff --git a/tools/cmake/cores/Cortex-M23-NS.cmake b/tools/cmake/cores/Cortex-M23-NS.cmake
index 6244645ca61..7e8e0c85ae4 100644
--- a/tools/cmake/cores/Cortex-M23-NS.cmake
+++ b/tools/cmake/cores/Cortex-M23-NS.cmake
@@ -7,15 +7,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
         "-mthumb"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    list(APPEND c_cxx_compile_options
+    list(APPEND common_options
         "-mcpu=cortex-m23"
     )
-    list(APPEND asm_compile_options
-        "-mcpu=Cortex-M23"
-    )
-    list(APPEND link_options
-        "--cpu=Cortex-M23"
-    )
 endif()
 
 
diff --git a/tools/cmake/cores/Cortex-M23.cmake b/tools/cmake/cores/Cortex-M23.cmake
index 9000ffe606e..b78cc8eb253 100644
--- a/tools/cmake/cores/Cortex-M23.cmake
+++ b/tools/cmake/cores/Cortex-M23.cmake
@@ -7,15 +7,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
         "-mthumb"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    list(APPEND c_cxx_compile_options
+    list(APPEND common_options
         "-mcpu=cortex-m23"
     )
-    list(APPEND asm_compile_options
-        "-mcpu=Cortex-M23"
-    )
-    list(APPEND link_options
-        "--cpu=Cortex-M23"
-    )
 endif()
 
 
diff --git a/tools/cmake/cores/Cortex-M3.cmake b/tools/cmake/cores/Cortex-M3.cmake
index 949896ef69b..f260799a13e 100644
--- a/tools/cmake/cores/Cortex-M3.cmake
+++ b/tools/cmake/cores/Cortex-M3.cmake
@@ -8,15 +8,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
         "-mcpu=cortex-m3"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    list(APPEND c_cxx_compile_options
+    list(APPEND common_options
         "-mcpu=cortex-m3"
     )
-    list(APPEND asm_compile_options
-        "-mcpu=Cortex-M3"
-    )
-    list(APPEND link_options
-        "--cpu=Cortex-M3"
-    )
 endif()
 
 function(mbed_set_cpu_core_definitions target)
diff --git a/tools/cmake/cores/Cortex-M33F-NS.cmake b/tools/cmake/cores/Cortex-M33F-NS.cmake
index 1c09380833f..7e610477aa4 100644
--- a/tools/cmake/cores/Cortex-M33F-NS.cmake
+++ b/tools/cmake/cores/Cortex-M33F-NS.cmake
@@ -10,17 +10,11 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
         "-march=armv8-m.main"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    list(APPEND c_cxx_compile_options
+    list(APPEND common_options
         "-mcpu=cortex-m33+nodsp"
         "-mfpu=fpv5-sp-d16"
         "-mfloat-abi=hard"
     )
-    list(APPEND asm_compile_options
-        "-mcpu=Cortex-M33.no_dsp"
-    )
-    list(APPEND link_options
-        "--cpu=Cortex-M33.no_dsp"
-    )
 endif()
 
 
diff --git a/tools/cmake/cores/Cortex-M33F.cmake b/tools/cmake/cores/Cortex-M33F.cmake
index b858c6241cf..4e0b3bdf3b6 100644
--- a/tools/cmake/cores/Cortex-M33F.cmake
+++ b/tools/cmake/cores/Cortex-M33F.cmake
@@ -10,17 +10,11 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
         "-march=armv8-m.main"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    list(APPEND c_cxx_compile_options
+    list(APPEND common_options
         "-mcpu=cortex-m33+nodsp"
         "-mfpu=fpv5-sp-d16"
         "-mfloat-abi=hard"
     )
-    list(APPEND asm_compile_options
-        "-mcpu=Cortex-M33.no_dsp"
-    )
-    list(APPEND link_options
-        "--cpu=Cortex-M33.no_dsp"
-    )
 endif()
 
 function(mbed_set_cpu_core_definitions target)
diff --git a/tools/cmake/cores/Cortex-M33FE-NS.cmake b/tools/cmake/cores/Cortex-M33FE-NS.cmake
index 1d8167d2522..947c520767b 100644
--- a/tools/cmake/cores/Cortex-M33FE-NS.cmake
+++ b/tools/cmake/cores/Cortex-M33FE-NS.cmake
@@ -10,15 +10,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
         "-march=armv8-m.main+dsp"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    list(APPEND c_cxx_compile_options
+    list(APPEND common_options
         "-mcpu=cortex-m33"
     )
-    list(APPEND asm_compile_options
-        "-mcpu=Cortex-M33"
-    )
-    list(APPEND link_options
-        "--cpu=Cortex-M33"
-    )
 endif()
 
 function(mbed_set_cpu_core_definitions target)
diff --git a/tools/cmake/cores/Cortex-M33FE.cmake b/tools/cmake/cores/Cortex-M33FE.cmake
index aaf4e30a805..72570bbaa1e 100644
--- a/tools/cmake/cores/Cortex-M33FE.cmake
+++ b/tools/cmake/cores/Cortex-M33FE.cmake
@@ -10,15 +10,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
         "-march=armv8-m.main+dsp"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    list(APPEND c_cxx_compile_options
+    list(APPEND common_options
         "-mcpu=cortex-m33"
     )
-    list(APPEND asm_compile_options
-        "-mcpu=Cortex-M33"
-    )
-    list(APPEND link_options
-        "--cpu=Cortex-M33"
-    )
 endif()
 
 function(mbed_set_cpu_core_definitions target)
diff --git a/tools/cmake/cores/Cortex-M4.cmake b/tools/cmake/cores/Cortex-M4.cmake
index 2faecd057ea..9ff08dc9719 100644
--- a/tools/cmake/cores/Cortex-M4.cmake
+++ b/tools/cmake/cores/Cortex-M4.cmake
@@ -8,16 +8,10 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
         "-mcpu=cortex-m4"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    list(APPEND c_cxx_compile_options
+    list(APPEND common_options
         "-mcpu=cortex-m4"
         "-mfpu=none"
     )
-    list(APPEND asm_compile_options
-        "-mcpu=Cortex-M4.no_fp"
-    )
-    list(APPEND link_options
-        "--cpu=Cortex-M4.no_fp"
-    )
 endif()
 
 function(mbed_set_cpu_core_definitions target)
diff --git a/tools/cmake/cores/Cortex-M4F.cmake b/tools/cmake/cores/Cortex-M4F.cmake
index 8c4293c45ed..5caaf39f181 100644
--- a/tools/cmake/cores/Cortex-M4F.cmake
+++ b/tools/cmake/cores/Cortex-M4F.cmake
@@ -10,17 +10,11 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
         "-mfloat-abi=softfp"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    list(APPEND c_cxx_compile_options
+    list(APPEND common_options
         "-mcpu=cortex-m4"
         "-mfpu=fpv4-sp-d16"
         "-mfloat-abi=hard"
     )
-    list(APPEND asm_compile_options
-        "-mcpu=Cortex-M4"
-    )
-    list(APPEND link_options
-        "--cpu=Cortex-M4"
-    )
 endif()
 
 function(mbed_set_cpu_core_definitions target)
diff --git a/tools/cmake/cores/Cortex-M7.cmake b/tools/cmake/cores/Cortex-M7.cmake
index 4184f7b93b9..4f33f421440 100644
--- a/tools/cmake/cores/Cortex-M7.cmake
+++ b/tools/cmake/cores/Cortex-M7.cmake
@@ -8,16 +8,10 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
         "-mcpu=cortex-m7"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    list(APPEND c_cxx_compile_options
+    list(APPEND common_options
         "-mcpu=cortex-m7"
         "-mfpu=none"
     )
-    list(APPEND asm_compile_options
-        "-mcpu=Cortex-M7.no_fp"
-    )
-    list(APPEND link_options
-        "--cpu=Cortex-M7.no_fp"
-    )
 endif()
 
 function(mbed_set_cpu_core_definitions target)
diff --git a/tools/cmake/cores/Cortex-M7FD.cmake b/tools/cmake/cores/Cortex-M7FD.cmake
index abdfc5e15dc..c1daea9edf6 100644
--- a/tools/cmake/cores/Cortex-M7FD.cmake
+++ b/tools/cmake/cores/Cortex-M7FD.cmake
@@ -10,17 +10,11 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
         "-mcpu=cortex-m7"
     )
 elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
-    list(APPEND c_cxx_compile_options
+    list(APPEND common_options
         "-mcpu=cortex-m7"
         "-mfpu=fpv5-d16"
         "-mfloat-abi=hard"
     )
-    list(APPEND asm_compile_options
-        "-mcpu=Cortex-M7"
-    )
-    list(APPEND link_options
-        "--cpu=Cortex-M7"
-    )
 endif()
 
 function(mbed_set_cpu_core_definitions target)