commit 6f0cf95db52a8e3b5ba24c080997e71633537cbd
author Feder Liang <feder.liang@arm.com> Tue Mar 22 11:43:37 2022 +0800
committer Ken Liu <ken.liu@arm.com> Wed Mar 30 08:18:54 2022 +0200
tree 53618e2bff0b9ed896499bec1b1c015ca6901fca
parent d6dbe513f2fef6b9350953a71b28296ecd496a38

SPM: Add __ARM_ARCH_8_1M_MAIN__ macro for GNU Arm Embedded Toolchain

Adding __ARM_ARCH_8_1M_MAIN__ compile definition manually for GNU Arm
Embedded Toolchain doesn't emit this macro automatically for the
armv8.1-m.main architecture.

Signed-off-by: Feder Liang <feder.liang@arm.com>
Change-Id: Idce3893cd49ac68364c784f3c7e329752c6aa025

toolchain_GNUARM.cmake

diff --git a/toolchain_GNUARM.cmake b/toolchain_GNUARM.cmake
index 4efd4d0..ee31875 100644
--- a/toolchain_GNUARM.cmake
+++ b/toolchain_GNUARM.cmake
@@ -164,6 +164,9 @@
         set(COMPILER_CP_FLAG -mfloat-abi=soft)
         set(LINKER_CP_OPTION -mfloat-abi=soft)
     endif()
+
+    # For GNU Arm Embedded Toolchain doesn't emit __ARM_ARCH_8_1M_MAIN__, adding this macro manually.
+    add_compile_definitions($<$<STREQUAL:${TFM_SYSTEM_ARCHITECTURE},armv8.1-m.main>:__ARM_ARCH_8_1M_MAIN__>)
 endmacro()
 
 # Configure environment for the compiler setup run by cmake at the first