cmake: Armclang - Fix assembler and linker flags

For Armclang, change compiler flag to `-mcpu` and assembler and linker
flag to `--cpu`.

Signed-off-by: Devaraj Ranganna <devaraj.ranganna@arm.com>

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()

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()