commit a8b6b690d00a87f91f1d9652c5e2a0febe1851a0
author Xinyu Zhang <xinyu.zhang@arm.com> Mon Jun 06 10:50:28 2022 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Wed Jun 08 03:12:35 2022 +0200
tree 33fce10ec984372a551253d482ae3fb9ff69c721
parent 5e19dada1077e024558f7ccae98f5a18bebcb3e4

Build: Deprecate TFM_SYSTEM_FP in ARMCLANG & IAR toolchains

Currently FP in TFM is only supported by GCC. The only purpose of
FP related config 'TFM_SYSTEM_FP' in ARMCLANG & IAR toolchains is
to set compiler flags for the time being.
To avoid any confusion, this config needs to be deprecated.

Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I3c310fa19a709aa714374b4e6e762c38dee9e1b7

toolchain_ARMCLANG.cmake

diff --git a/toolchain_ARMCLANG.cmake b/toolchain_ARMCLANG.cmake
index 6d2d53c..01d1423 100644
--- a/toolchain_ARMCLANG.cmake
+++ b/toolchain_ARMCLANG.cmake
@@ -45,8 +45,8 @@
         $<$<COMPILE_LANGUAGE:C>:-masm=auto>
         $<$<COMPILE_LANGUAGE:C>:-nostdlib>
         $<$<COMPILE_LANGUAGE:C>:-std=c99>
-        $<$<AND:$<COMPILE_LANGUAGE:C>,$<NOT:$<BOOL:${TFM_SYSTEM_FP}>>>:-mfpu=none>
-        $<$<AND:$<COMPILE_LANGUAGE:ASM>,$<NOT:$<BOOL:${TFM_SYSTEM_FP}>>>:--fpu=none>
+        $<$<COMPILE_LANGUAGE:C>:-mfpu=none>
+        $<$<COMPILE_LANGUAGE:ASM>:--fpu=none>
         $<$<COMPILE_LANGUAGE:ASM>:--cpu=${CMAKE_ASM_CPU_FLAG}>
         $<$<AND:$<COMPILE_LANGUAGE:C>,$<BOOL:${TFM_DEBUG_SYMBOLS}>>:-g>
     )
@@ -78,7 +78,7 @@
         --diag_suppress=6304
         # Pattern only matches removed unused sections.
         --diag_suppress=6329
-        $<$<NOT:$<BOOL:${TFM_SYSTEM_FP}>>:--fpu=softvfp>
+        --fpu=softvfp
     )
 endmacro()
 
@@ -92,12 +92,6 @@
             endif()
         endif()
 
-        if (DEFINED TFM_SYSTEM_FP)
-            if(NOT TFM_SYSTEM_FP)
-                string(APPEND CMAKE_SYSTEM_PROCESSOR "+nofp")
-            endif()
-        endif()
-
         if (DEFINED TFM_SYSTEM_DSP)
             if(NOT TFM_SYSTEM_DSP)
                 string(APPEND CMAKE_SYSTEM_PROCESSOR "+nodsp")
@@ -119,10 +113,6 @@
             if (TFM_SYSTEM_MVE)
                 string(APPEND CMAKE_ASM_CPU_FLAG ".mve")
             endif()
-
-            if (TFM_SYSTEM_FP)
-                string(APPEND CMAKE_ASM_CPU_FLAG ".fp")
-            endif()
         endif()
     endif()
 
@@ -145,12 +135,6 @@
         endif()
     endif()
 
-    if (DEFINED TFM_SYSTEM_FP)
-        if(NOT TFM_SYSTEM_FP)
-            string(APPEND CMAKE_SYSTEM_ARCH "+nofp")
-        endif()
-    endif()
-
     if (DEFINED TFM_SYSTEM_DSP)
         if(NOT TFM_SYSTEM_DSP)
             string(APPEND CMAKE_SYSTEM_ARCH "+nodsp")

toolchain_IARARM.cmake

diff --git a/toolchain_IARARM.cmake b/toolchain_IARARM.cmake
index 8d2c5f6..27f2bf4 100644
--- a/toolchain_IARARM.cmake
+++ b/toolchain_IARARM.cmake
@@ -49,7 +49,7 @@
         $<$<COMPILE_LANGUAGE:C,CXX>:-DNO_TYPEOF>
         $<$<COMPILE_LANGUAGE:C,CXX>:-D_NO_DEFINITIONS_IN_HEADER_FILES>
         $<$<COMPILE_LANGUAGE:C,CXX>:--diag_suppress=Pe546,Pe940,Pa082,Pa084>
-        $<$<AND:$<COMPILE_LANGUAGE:C,CXX,ASM>,$<NOT:$<BOOL:${TFM_SYSTEM_FP}>>>:--fpu=none>
+        $<$<COMPILE_LANGUAGE:C,CXX,ASM>:--fpu=none>
         $<$<AND:$<COMPILE_LANGUAGE:C,CXX,ASM>,$<BOOL:${TFM_DEBUG_SYMBOLS}>,$<CONFIG:Release,MinSizeRel>>:-r>
     )
 endmacro()
@@ -61,7 +61,7 @@
       --silent
       --semihosting
       --redirect __write=__write_buffered
-      $<$<NOT:$<BOOL:${TFM_SYSTEM_FP}>>:--fpu=none>
+      --fpu=none
     )
 endmacro()