commit 95fb876360824456d7685f9c6f3d000c5ce7fab9
author Shawn Shan <Shawn.Shan@arm.com> Fri Jun 25 16:48:40 2021 +0800
committer Ken Liu <ken.liu@arm.com> Fri Jun 25 11:14:29 2021 +0200
tree 287956259632828b5bb67d60e258b09ae806ad64
parent 202d4153e2eb52b3065010aa370bb39e0d94a105

Build:`no_merge` Workarond for psa-arch-test

Global `no_merge` increased tfm-test test code size much. Create
a temp workaround specific for psa-arch-test. The final solution
is under investigating.

Change-Id: I9c8853c39e322d57ba8e29b9d8c3caedd987d75c
Signed-off-by: Shawn Shan <Shawn.Shan@arm.com>

toolchain_ARMCLANG.cmake

diff --git a/toolchain_ARMCLANG.cmake b/toolchain_ARMCLANG.cmake
index 13df5bd..68e320a 100644
--- a/toolchain_ARMCLANG.cmake
+++ b/toolchain_ARMCLANG.cmake
@@ -60,7 +60,7 @@
         --strict
         --symbols
         --xref
-        $<$<VERSION_GREATER:${TFM_ISOLATION_LEVEL},1>:--no-merge>
+        $<$<AND:$<VERSION_GREATER:${TFM_ISOLATION_LEVEL},1>,$<STREQUAL:"${TEST_PSA_API}","IPC">>:--no-merge>
         # Suppress link warnings that are consistant (and therefore hopefully
         # harmless)
         # https://developer.arm.com/documentation/100074/0608/linker-errors-and-warnings/list-of-the-armlink-error-and-warning-messages