From 1efcc3f957e7f64dc8b2b9d7061c0ef7050466cd Mon Sep 17 00:00:00 2001
From: Kristofer Jonsson <kristofer.jonsson@arm.com>
Date: Tue, 16 Feb 2021 17:40:25 +0100
Subject: Assembly support

Update the Arm Clang toolchain file to support assembly files.

Removing cmsis_core dependency. Applications that depend on CMSIS
should add that dependency manually.

Change-Id: I42d68e6734acc88aef8f9af124b5e76079b839b5
---
 cmake/toolchain/armclang.cmake | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

(limited to 'cmake')

diff --git a/cmake/toolchain/armclang.cmake b/cmake/toolchain/armclang.cmake
index f8d299a..7d607ed 100644
--- a/cmake/toolchain/armclang.cmake
+++ b/cmake/toolchain/armclang.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2021 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -24,6 +24,7 @@ set(__TOOLCHAIN_LOADED TRUE)
 set(CMAKE_SYSTEM_NAME Generic)
 set(CMAKE_C_COMPILER "armclang")
 set(CMAKE_CXX_COMPILER "armclang")
+set(CMAKE_ASM_COMPILER "armclang")
 set(CMAKE_SYSTEM_PROCESSOR "cortex-m33+nodsp" CACHE STRING "Select Cortex-M architure. (cortex-m0, cortex-m3, cortex-m33, cortex-m4, cortex-m55, cortex-m7, etc)")
 
 set(CMAKE_C_STANDARD 99)
@@ -40,7 +41,9 @@ if(__OFFSET GREATER_EQUAL 0)
 endif()
 
 # Add -mcpu to the compile options to override the -mcpu the CMake toolchain adds
-add_compile_options(-mcpu=${__CPU_COMPILE_TARGET})
+add_compile_options(
+    -mcpu=${__CPU_COMPILE_TARGET}
+    "$<$<COMPILE_LANGUAGE:ASM>:-masm=auto;--target=arm-arm-none-eabi>")
 
 # Set floating point unit
 if("${__CPU_COMPILE_TARGET}" MATCHES "\\+fp")
@@ -48,7 +51,9 @@ if("${__CPU_COMPILE_TARGET}" MATCHES "\\+fp")
 elseif("${__CPU_COMPILE_TARGET}" MATCHES "\\+nofp")
     set(FLOAT soft)
 elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "cortex-m33" OR
-       "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "cortex-m55")
+       "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "cortex-m4" OR
+       "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "cortex-m55" OR
+       "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "cortex-m7")
     set(FLOAT hard)
 else()
     set(FLOAT soft)
@@ -78,8 +83,22 @@ add_link_options(--lto --info common,debug,sizes,totals,veneers,unused --symbols
 #
 
 add_compile_options(-Wall -Wextra
-                    -Wsign-compare -Wunused -Wswitch-default -Wformat -Wdouble-promotion -Wredundant-decls -Wshadow -Wcast-align -Wnull-dereference
-                    -Wno-format-extra-args -Wno-unused-function -Wno-unused-label -Wno-missing-field-initializers -Wno-return-type)
+                    -Wsign-compare
+                    -Wunused
+                    -Wswitch-default
+                    -Wformat
+                    -Wdouble-promotion
+                    -Wredundant-decls
+                    -Wshadow
+                    -Wcast-align
+                    -Wnull-dereference
+                    -Wno-deprecated-register
+                    -Wno-format-extra-args
+                    -Wno-missing-field-initializers
+                    -Wno-unused-function
+                    -Wno-unused-label
+                    -Wno-unused-parameter
+                    -Wno-return-type)
 add_compile_options(-fno-unwind-tables -fno-rtti -fno-exceptions)
 add_compile_options(-mthumb)
 add_compile_options("$<$<CONFIG:DEBUG>:-gdwarf-3>")
-- 
cgit v1.2.1