commit d9a6f597187cb3cf76f332d748fdacc554ea7c6d
author Ashutosh Singh <ashutosh.singh@arm.com> Thu Apr 11 16:50:11 2019 +0100
committer David Hu <david.hu@arm.com> Thu Sep 26 09:39:15 2019 +0800
tree 01486e1efdae2973dd7e968e2109755b678450df
parent b0aa3287e055abf8ffa9a26a97512f1735ee1f52

Core: Add support for Cortex-M0plus and Cortex-M4

This patch adds support Cortex-M0plus and Cortex-M4 cpus.
Add Cortex-M0plus and Cortex-M4 entries in ARMCLANG cmake file.

Change-Id: I9c14d66d7cb7a0df185f8922f000179a184c2166
Signed-off-by: Ashutosh Singh <ashutosh.singh@arm.com>

cmake/Common/CompilerArmClang610.cmake

diff --git a/cmake/Common/CompilerArmClang610.cmake b/cmake/Common/CompilerArmClang610.cmake
index 2570a01..af9b7a5 100644
--- a/cmake/Common/CompilerArmClang610.cmake
+++ b/cmake/Common/CompilerArmClang610.cmake
@@ -36,6 +36,13 @@
 	string_append_unique_item(STRING CMAKE_CXX_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m")
 	string_append_unique_item(STRING CMAKE_ASM_FLAGS_CPU KEY "--cpu=" VAL "--cpu=7-M")
 	string_append_unique_item(STRING CMAKE_LINK_FLAGS_CPU KEY "--cpu=" VAL "--cpu=7-M")
+elseif(${ARM_CPU_ARCHITECTURE} STREQUAL "ARMv6-M")
+	string_append_unique_item(STRING CMAKE_C_FLAGS_CPU KEY "--target=" VAL "--target=arm-arm-none-eabi")
+	string_append_unique_item(STRING CMAKE_C_FLAGS_CPU KEY "-march=" VAL "-march=armv6-m")
+	string_append_unique_item(STRING CMAKE_CXX_FLAGS_CPU KEY "--target=" VAL "--target=arm-arm-none-eabi")
+	string_append_unique_item(STRING CMAKE_CXX_FLAGS_CPU KEY "-march=" VAL "-march=armv6-m")
+	string_append_unique_item(STRING CMAKE_ASM_FLAGS_CPU KEY "--cpu=" VAL "--cpu=6-M")
+	string_append_unique_item(STRING CMAKE_LINK_FLAGS_CPU KEY "--cpu=" VAL "--cpu=6-M")
 else()
 	message(FATAL_ERROR "Unknown or unsupported ARM cpu architecture setting.")
 endif()
@@ -65,6 +72,22 @@
 		string_append_unique_item(STRING CMAKE_CXX_FLAGS_CPU KEY "-mcpu=" VAL "-mcpu=cortex-m23")
 		string_append_unique_item(STRING CMAKE_ASM_FLAGS_CPU KEY "--cpu" VAL "--cpu=Cortex-M23")
 		string_append_unique_item(STRING CMAKE_LINK_FLAGS_CPU KEY "--cpu" VAL "--cpu=Cortex-M23")
+	elseif(${ARM_CPU_TYPE} STREQUAL "Cortex-M4")
+		string_append_unique_item(STRING CMAKE_C_FLAGS_CPU KEY "--target=" VAL "--target=arm-arm-none-eabi")
+		string_append_unique_item(STRING CMAKE_C_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m")
+		string_append_unique_item(STRING CMAKE_CXX_FLAGS_CPU KEY "--target=" VAL "--target=arm-arm-none-eabi")
+		string_append_unique_item(STRING CMAKE_CXX_FLAGS_CPU KEY "-march=" VAL "-march=armv7-m")
+		string_append_unique_item(STRING CMAKE_ASM_FLAGS_CPU KEY "--cpu=" VAL "--cpu=Cortex-M4")
+		string_append_unique_item(STRING CMAKE_LINK_FLAGS_CPU KEY "--cpu=" VAL "--cpu=Cortex-M4")
+		set(ARM_CPU_ARCHITECTURE "ARMv7-M")
+	elseif(${ARM_CPU_TYPE} STREQUAL "Cortex-M0p")
+		string_append_unique_item(STRING CMAKE_C_FLAGS_CPU KEY "--target=" VAL "--target=arm-arm-none-eabi")
+		string_append_unique_item(STRING CMAKE_C_FLAGS_CPU KEY "-march=" VAL "-march=armv6-m")
+		string_append_unique_item(STRING CMAKE_CXX_FLAGS_CPU KEY "--target=" VAL "--target=arm-arm-none-eabi")
+		string_append_unique_item(STRING CMAKE_CXX_FLAGS_CPU KEY "-march=" VAL "-march=armv6-m")
+		string_append_unique_item(STRING CMAKE_ASM_FLAGS_CPU KEY "--cpu=" VAL "--cpu=Cortex-M0plus")
+		string_append_unique_item(STRING CMAKE_LINK_FLAGS_CPU KEY "--cpu=" VAL "--cpu=Cortex-M0plus")
+		set(ARM_CPU_ARCHITECTURE "ARMv6-M")
 	else()
 		message(FATAL_ERROR "Unknown ARM cpu setting.")
 	endif()