commit d831cf126489b41a921137d850831fd5fbdbc4a4
author Mark Horvath <mark.horvath@arm.com> Thu Sep 08 17:44:33 2022 +0200
committer David Hu <david.hu@arm.com> Fri Sep 09 04:34:16 2022 +0200
tree c18cfb14f057792a4d4a94a40ec603b2520af352
parent 5a3240604df10cefe0f4805ddd09c0a60c85e26c

Build: Fix M85 fallback to arch in case of GCC

Signed-off-by: Mark Horvath <mark.horvath@arm.com>
Change-Id: Ie0604bcf6157b213bdb7e4c81ffcab7966f67a1a

toolchain_GNUARM.cmake

diff --git a/toolchain_GNUARM.cmake b/toolchain_GNUARM.cmake
index 8ddeddc..f7ee277 100644
--- a/toolchain_GNUARM.cmake
+++ b/toolchain_GNUARM.cmake
@@ -93,14 +93,14 @@
                         string(APPEND CMAKE_SYSTEM_PROCESSOR "+nofp")
                 endif()
             endif()
-        endif()
 
-        if(TFM_SYSTEM_ARCHITECTURE STREQUAL "armv8.1-m.main")
-            if(NOT CONFIG_TFM_ENABLE_MVE)
-                string(APPEND CMAKE_SYSTEM_PROCESSOR "+nomve")
-            endif()
-            if(NOT CONFIG_TFM_ENABLE_MVE_FP)
-                string(APPEND CMAKE_SYSTEM_PROCESSOR "+nomve.fp")
+            if(TFM_SYSTEM_ARCHITECTURE STREQUAL "armv8.1-m.main")
+                if(NOT CONFIG_TFM_ENABLE_MVE)
+                    string(APPEND CMAKE_SYSTEM_PROCESSOR "+nomve")
+                endif()
+                if(NOT CONFIG_TFM_ENABLE_MVE_FP)
+                    string(APPEND CMAKE_SYSTEM_PROCESSOR "+nomve.fp")
+                endif()
             endif()
         endif()