Merge pull request #13534 from 0xc0170/fix_cmake_armasm

0xc0170 · web-flow · commit 1272a432c7dd · 2020-09-03T12:37:06.000+01:00
CMake: Use armclang for ASM files
diff --git a/cmake/cores/Cortex-A9.cmake b/cmake/cores/Cortex-A9.cmake
@@ -31,7 +31,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
             PUBLIC
                 $<$<COMPILE_LANGUAGE:C>:${compile_options}>
                 $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-A9>
+                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-A9>
         )
 
         target_link_options(${target}
diff --git a/cmake/cores/Cortex-M0+.cmake b/cmake/cores/Cortex-M0+.cmake
@@ -27,7 +27,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
             PUBLIC
                 $<$<COMPILE_LANGUAGE:C>:${compile_options}>
                 $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M0plus>
+                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M0plus>
         )
 
         target_link_options(${target}
diff --git a/cmake/cores/Cortex-M0.cmake b/cmake/cores/Cortex-M0.cmake
@@ -26,7 +26,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
             PUBLIC
                 $<$<COMPILE_LANGUAGE:C>:${compile_options}>
                 $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:-cpu=Cortex-M0>
+                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M0>
         )
 
         target_link_options(${target}
diff --git a/cmake/cores/Cortex-M1.cmake b/cmake/cores/Cortex-M1.cmake
@@ -26,7 +26,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
             PUBLIC
                 $<$<COMPILE_LANGUAGE:C>:${compile_options}>
                 $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M1>
+                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M1>
         )
 
         target_link_options(${target}
diff --git a/cmake/cores/Cortex-M23-NS.cmake b/cmake/cores/Cortex-M23-NS.cmake
@@ -26,7 +26,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
             PUBLIC
                 $<$<COMPILE_LANGUAGE:C>:${compile_options}>
                 $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M23>
+                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M23>
         )
 
         target_link_options(${target}
diff --git a/cmake/cores/Cortex-M23.cmake b/cmake/cores/Cortex-M23.cmake
@@ -26,7 +26,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
             PUBLIC
                 $<$<COMPILE_LANGUAGE:C>:${compile_options}>
                 $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M23>
+                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M23>
         )
 
         target_link_options(${target}
diff --git a/cmake/cores/Cortex-M3.cmake b/cmake/cores/Cortex-M3.cmake
@@ -26,7 +26,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
             PUBLIC
                 $<$<COMPILE_LANGUAGE:C>:${compile_options}>
                 $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M3>
+                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M3>
         )
 
         target_link_options(${target}
diff --git a/cmake/cores/Cortex-M33-NS.cmake b/cmake/cores/Cortex-M33-NS.cmake
@@ -28,7 +28,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
             PUBLIC
                 $<$<COMPILE_LANGUAGE:C>:${compile_options}>
                 $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M33.no_dsp.no_fp>
+                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M33.no_dsp.no_fp>
         )
 
         target_link_options(${target}
diff --git a/cmake/cores/Cortex-M33.cmake b/cmake/cores/Cortex-M33.cmake
@@ -30,7 +30,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
             PUBLIC
                 $<$<COMPILE_LANGUAGE:C>:${compile_options}>
                 $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M33.no_dsp.no_fp>
+                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M33.no_dsp.no_fp>
         )
 
         target_link_options(${target}
diff --git a/cmake/cores/Cortex-M33F-NS.cmake b/cmake/cores/Cortex-M33F-NS.cmake
@@ -31,7 +31,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
             PUBLIC
                 $<$<COMPILE_LANGUAGE:C>:${compile_options}>
                 $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M33.no_dsp>
+                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M33.no_dsp>
         )
 
         target_link_options(${target}
diff --git a/cmake/cores/Cortex-M33F.cmake b/cmake/cores/Cortex-M33F.cmake
@@ -31,7 +31,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
             PUBLIC
                 $<$<COMPILE_LANGUAGE:C>:${compile_options}>
                 $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M33.no_dsp>
+                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M33.no_dsp>
         )
 
         target_link_options(${target}
diff --git a/cmake/cores/Cortex-M33FE-NS.cmake b/cmake/cores/Cortex-M33FE-NS.cmake
@@ -29,7 +29,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
             PUBLIC
                 $<$<COMPILE_LANGUAGE:C>:${compile_options}>
                 $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M33>
+                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M33>
         )
 
         target_link_options(${target}
diff --git a/cmake/cores/Cortex-M33FE.cmake b/cmake/cores/Cortex-M33FE.cmake
@@ -29,7 +29,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
             PUBLIC
                 $<$<COMPILE_LANGUAGE:C>:${compile_options}>
                 $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M33>
+                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M33>
         )
 
         target_link_options(${target}
diff --git a/cmake/cores/Cortex-M4.cmake b/cmake/cores/Cortex-M4.cmake
@@ -28,7 +28,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
             PUBLIC
                 $<$<COMPILE_LANGUAGE:C>:${compile_options}>
                 $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M4.no_fp>
+                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M4.no_fp>
         )
 
         target_link_options(${target}
diff --git a/cmake/cores/Cortex-M4F.cmake b/cmake/cores/Cortex-M4F.cmake
@@ -40,7 +40,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
             PUBLIC
                 $<$<COMPILE_LANGUAGE:C>:${compile_options}>
                 $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M4>
+                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M4>
         )
 
         target_link_options(${target}
diff --git a/cmake/cores/Cortex-M7.cmake b/cmake/cores/Cortex-M7.cmake
@@ -28,7 +28,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
             PUBLIC
                 $<$<COMPILE_LANGUAGE:C>:${compile_options}>
                 $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M7.no_fp>
+                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M7.no_fp>
         )
 
         target_link_options(${target}
diff --git a/cmake/cores/Cortex-M7F.cmake b/cmake/cores/Cortex-M7F.cmake
@@ -31,7 +31,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
             PUBLIC
                 $<$<COMPILE_LANGUAGE:C>:${compile_options}>
                 $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M7.fp.sp>
+                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M7.fp.sp>
         )
 
         target_link_options(${target}
diff --git a/cmake/cores/Cortex-M7FD.cmake b/cmake/cores/Cortex-M7FD.cmake
@@ -31,7 +31,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)
             PUBLIC
                 $<$<COMPILE_LANGUAGE:C>:${compile_options}>
                 $<$<COMPILE_LANGUAGE:CXX>:${compile_options}>
-                $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M7>
+                $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M7>
         )
 
         target_link_options(${target}
diff --git a/cmake/toolchains/ARM.cmake b/cmake/toolchains/ARM.cmake
@@ -1,7 +1,7 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-set(CMAKE_ASM_COMPILER "armasm")
+set(CMAKE_ASM_COMPILER "armclang")
 set(CMAKE_C_COMPILER "armclang")
 set(CMAKE_CXX_COMPILER "armclang")
 set(CMAKE_AR "armar")
@@ -42,14 +42,10 @@ function(mbed_set_toolchain_options target)
             $<$<COMPILE_LANGUAGE:CXX>:${common_options}>
     )
 
-    set(asm_preproc_options
-        "--target=arm-arm-none-eabi,-D,MBED_CONF_PLATFORM_CRASH_CAPTURE_ENABLED"
-    )
     target_compile_options(${target}
         PUBLIC
+            $<$<COMPILE_LANGUAGE:ASM>:--target=arm-arm-none-eabi -masm=auto>
             $<$<COMPILE_LANGUAGE:ASM>:${MBED_STUDIO_ARM_COMPILER}>
-            $<$<COMPILE_LANGUAGE:ASM>:--cpreproc>
-            $<$<COMPILE_LANGUAGE:ASM>:--cpreproc_opts=${asm_preproc_options}>
     )
 
     target_compile_definitions(${target}

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)`
`31`	`31`	`PUBLIC`
`32`	`32`	`$<$<COMPILE_LANGUAGE:C>:${compile_options}>`
`33`	`33`	`$<$<COMPILE_LANGUAGE:CXX>:${compile_options}>`
`34`		`- $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-A9>`
	`34`	`+ $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-A9>`
`35`	`35`	`)`
`36`	`36`
`37`	`37`	`target_link_options(${target}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)`
`27`	`27`	`PUBLIC`
`28`	`28`	`$<$<COMPILE_LANGUAGE:C>:${compile_options}>`
`29`	`29`	`$<$<COMPILE_LANGUAGE:CXX>:${compile_options}>`
`30`		`- $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M0plus>`
	`30`	`+ $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M0plus>`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`target_link_options(${target}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)`
`26`	`26`	`PUBLIC`
`27`	`27`	`$<$<COMPILE_LANGUAGE:C>:${compile_options}>`
`28`	`28`	`$<$<COMPILE_LANGUAGE:CXX>:${compile_options}>`
`29`		`- $<$<COMPILE_LANGUAGE:ASM>:-cpu=Cortex-M0>`
	`29`	`+ $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M0>`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`target_link_options(${target}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)`
`28`	`28`	`PUBLIC`
`29`	`29`	`$<$<COMPILE_LANGUAGE:C>:${compile_options}>`
`30`	`30`	`$<$<COMPILE_LANGUAGE:CXX>:${compile_options}>`
`31`		`- $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M33.no_dsp.no_fp>`
	`31`	`+ $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M33.no_dsp.no_fp>`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`target_link_options(${target}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)`
`30`	`30`	`PUBLIC`
`31`	`31`	`$<$<COMPILE_LANGUAGE:C>:${compile_options}>`
`32`	`32`	`$<$<COMPILE_LANGUAGE:CXX>:${compile_options}>`
`33`		`- $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M33.no_dsp.no_fp>`
	`33`	`+ $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M33.no_dsp.no_fp>`
`34`	`34`	`)`
`35`	`35`
`36`	`36`	`target_link_options(${target}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)`
`29`	`29`	`PUBLIC`
`30`	`30`	`$<$<COMPILE_LANGUAGE:C>:${compile_options}>`
`31`	`31`	`$<$<COMPILE_LANGUAGE:CXX>:${compile_options}>`
`32`		`- $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M33>`
	`32`	`+ $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M33>`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`target_link_options(${target}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ function(mbed_set_cpu_core_options target mbed_toolchain)`
`40`	`40`	`PUBLIC`
`41`	`41`	`$<$<COMPILE_LANGUAGE:C>:${compile_options}>`
`42`	`42`	`$<$<COMPILE_LANGUAGE:CXX>:${compile_options}>`
`43`		`- $<$<COMPILE_LANGUAGE:ASM>:--cpu=Cortex-M4>`
	`43`	`+ $<$<COMPILE_LANGUAGE:ASM>:-mcpu=Cortex-M4>`
`44`	`44`	`)`
`45`	`45`
`46`	`46`	`target_link_options(${target}`