commit cc45a7b1dd3d5621d138e1ff5c1e516a16cc4ed1
author Dávid Házi <david.hazi@arm.com> Mon Apr 15 22:30:28 2024 +0200
committer Anton Komlev <Anton.Komlev@arm.com> Mon Apr 22 22:32:14 2024 +0200
tree d4ab7cd85b8b045b69167824ffe48e1c93a7f9ab
parent 92c0a42f7f86b6b490aa64b0545c7bd2c7f5b522

build: Add IAR FPU support

Signed-off-by: Dávid Házi <david.hazi@arm.com>
Change-Id: I395609b9f02d928fcf547f3b9072264b2527b57a

toolchain_IARARM.cmake

diff --git a/toolchain_IARARM.cmake b/toolchain_IARARM.cmake
index 7c711a6..ba14c16 100644
--- a/toolchain_IARARM.cmake
+++ b/toolchain_IARARM.cmake
@@ -46,7 +46,6 @@
         $<$<COMPILE_LANGUAGE:C,CXX>:-D_NO_DEFINITIONS_IN_HEADER_FILES>
         $<$<COMPILE_LANGUAGE:C,CXX>:--diag_suppress=Pe546,Pe940,Pa082,Pa084>
         $<$<COMPILE_LANGUAGE:C,CXX>:--no_path_in_file_macros>
-        "$<$<COMPILE_LANGUAGE:C,CXX,ASM>:SHELL:--fpu none>"
         $<$<AND:$<COMPILE_LANGUAGE:C,CXX,ASM>,$<BOOL:${TFM_DEBUG_SYMBOLS}>,$<CONFIG:Release,MinSizeRel>>:-r>
     )
 endmacro()
@@ -59,7 +58,6 @@
       --semihosting
       --redirect __write=__write_buffered
       --diag_suppress=lp005,Lp023
-      "SHELL:--fpu none"
     )
 endmacro()
 
@@ -121,6 +119,29 @@
         $<$<COMPILE_LANGUAGE:ASM>:--fpu=none>
     )
     set(BL1_LINKER_CP_OPTION --fpu=none)
+
+    if (CONFIG_TFM_FLOAT_ABI STREQUAL "hard")
+        set(COMPILER_CP_FLAG
+            $<$<COMPILE_LANGUAGE:C>:-mfloat-abi=hard>
+        )
+
+        if (CONFIG_TFM_ENABLE_FP)
+            set(COMPILER_CP_FLAG
+                $<$<COMPILE_LANGUAGE:C>:--fpu=${CONFIG_TFM_FP_ARCH_ASM}>
+                $<$<COMPILE_LANGUAGE:ASM>:--fpu=${CONFIG_TFM_FP_ARCH_ASM}>
+            )
+            # armasm and armlink have the same option "--fpu" and are both used to
+            # specify the target FPU architecture. So the supported FPU architecture
+            # names can be shared by armasm and armlink.
+            set(LINKER_CP_OPTION --fpu=${CONFIG_TFM_FP_ARCH_ASM})
+        endif()
+    else()
+        set(COMPILER_CP_FLAG
+            $<$<COMPILE_LANGUAGE:C>:--fpu=none>
+            $<$<COMPILE_LANGUAGE:ASM>:--fpu=none>
+        )
+        set(LINKER_CP_OPTION --fpu=none)
+    endif()
 endmacro()
 
 # Configure environment for the compiler setup run by cmake at the first