commit 80a30a631175d355b183b38126172291c832cbe4
author David Hu <david.hu@arm.com> Sat Oct 01 22:01:47 2022 +0800
committer Anton Komlev <Anton.Komlev@arm.com> Thu Oct 06 16:34:33 2022 +0200
tree 20dc1ba2145e87ac9d32cac755a4225e6c9a7560
parent 6faa2db830d6e7d1dcbe3aad7ed13d485258aef6

Build: Fix Cortex-M23 build failure in GCC >= 8.0

Cortex-M23 doesn't support '+nofp' feature option in GCC >= 8.0.
Specify the CPU list which support '+nofp' and other CPUs are not added
with '+nofp'.

Change-Id: Ie6d42256415ac96e868ffb8e5bf639f0c1028bcb
Signed-off-by: David Hu <david.hu@arm.com>

toolchain_GNUARM.cmake

diff --git a/toolchain_GNUARM.cmake b/toolchain_GNUARM.cmake
index 8fa0d13..6f5c66f 100644
--- a/toolchain_GNUARM.cmake
+++ b/toolchain_GNUARM.cmake
@@ -93,9 +93,17 @@
                     string(APPEND CMAKE_SYSTEM_PROCESSOR "+nodsp")
                 endif()
             endif()
+            # GCC specifies that '+nofp' is available on following M-profile cpus: 'cortex-m4',
+            # 'cortex-m7', 'cortex-m33', 'cortex-m35p' and 'cortex-m55'.
+            # Build fails if other M-profile cpu, such as 'cortex-m23', is added with '+nofp'.
+            # Explicitly list those cpu to align with GCC description.
             if(GCC_VERSION VERSION_GREATER_EQUAL "8.0.0")
                 if(NOT CONFIG_TFM_ENABLE_FP AND
-                    NOT TFM_SYSTEM_ARCHITECTURE STREQUAL "armv6-m")
+                   (TFM_SYSTEM_PROCESSOR STREQUAL "cortex-m4"
+                    OR TFM_SYSTEM_PROCESSOR STREQUAL "cortex-m7"
+                    OR TFM_SYSTEM_PROCESSOR STREQUAL "cortex-m33"
+                    OR TFM_SYSTEM_PROCESSOR STREQUAL "cortex-m35p"
+                    OR TFM_SYSTEM_PROCESSOR STREQUAL "cortex-m55"))
                         string(APPEND CMAKE_SYSTEM_PROCESSOR "+nofp")
                 endif()
             endif()