commit a94a9c7aff16fb6ff114b5b6e1c65eda4c5dcb74
author chesun01 <Chendi.Sun@arm.com> Tue Feb 14 16:19:51 2023 +0800
committer Ken Liu <ken.liu@arm.com> Wed Feb 22 11:16:12 2023 +0100
tree dc806d284e0bebf14475e768a8f51bab46636542
parent 8faae452712b630dc69c24da61e84c88a901d2d4

Build: Create dedicated FP flags for Arm assembler(armasm).

As armasm does not support -mfloat-abi option for armclang to
specify whether to use hardware instructions or software library
functions for floating-point operations, compilation fails and
reports errors. Create a dedicated FP flags for assembler instead
of sharing the same FP flags with armclang.
Note armlink uses the same FP flags as armasm.

Signed-off-by: Chendi Sun <chendi.sun@arm.com>
Change-Id: If98f4accf237051e4bd9e0dee20ff0dce165400d

toolchain_ARMCLANG.cmake

diff --git a/toolchain_ARMCLANG.cmake b/toolchain_ARMCLANG.cmake
index 6645bfb..b7862ae 100644
--- a/toolchain_ARMCLANG.cmake
+++ b/toolchain_ARMCLANG.cmake
@@ -216,7 +216,10 @@
         set(CMAKE_CXX_FLAGS "-march=${CMAKE_SYSTEM_ARCH}")
     endif()
 
-    set(BL2_COMPILER_CP_FLAG -mfloat-abi=soft)
+    set(BL2_COMPILER_CP_FLAG
+        $<$<COMPILE_LANGUAGE:C>:-mfpu=softvfp>
+        $<$<COMPILE_LANGUAGE:ASM>:--fpu=softvfp>
+    )
     # As BL2 does not use hardware FPU, specify '--fpu=SoftVFP' explicitly to use software
     # library functions for BL2 to override any implicit FPU option, such as '--cpu' option.
     # Because the implicit hardware FPU option enforces BL2 to initialize FPU but hardware FPU
@@ -224,13 +227,24 @@
     set(BL2_LINKER_CP_OPTION --fpu=SoftVFP)
 
     if (CONFIG_TFM_FLOAT_ABI STREQUAL "hard")
-        set(COMPILER_CP_FLAG -mfloat-abi=hard)
+        set(COMPILER_CP_FLAG
+            $<$<COMPILE_LANGUAGE:C>:-mfloat-abi=hard>
+        )
         if (CONFIG_TFM_ENABLE_FP)
-            set(COMPILER_CP_FLAG -mfloat-abi=hard -mfpu=${CONFIG_TFM_FP_ARCH})
-            set(LINKER_CP_OPTION --fpu=${CONFIG_TFM_FP_ARCH_LINK})
+            set(COMPILER_CP_FLAG
+                $<$<COMPILE_LANGUAGE:C>:-mfpu=${CONFIG_TFM_FP_ARCH};-mfloat-abi=hard>
+                $<$<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 -mfloat-abi=soft)
+        set(COMPILER_CP_FLAG
+            $<$<COMPILE_LANGUAGE:C>:-mfpu=softvfp>
+            $<$<COMPILE_LANGUAGE:ASM>:--fpu=softvfp>
+        )
         set(LINKER_CP_OPTION --fpu=SoftVFP)
     endif()