[S] Change in coreboot[master]: arch/riscv: Fix compiler argument for clang

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/74568 )

Change subject: arch/riscv: Fix compiler argument for clang
......................................................................

arch/riscv: Fix compiler argument for clang

The suffixes zicsr and zifencei are assumed by default for clang.

Change-Id: I75947f614c3600d5d9d461970159f0787fd6c3de
Signed-off-by: Arthur Heymans 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74568
Tested-by: build bot (Jenkins) 
Reviewed-by: Elyes Haouas 
---
M src/arch/riscv/Makefile.inc
1 file changed, 23 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Elyes Haouas: Looks good to me, approved

diff --git a/src/arch/riscv/Makefile.inc b/src/arch/riscv/Makefile.inc
index bbbdeb0..cc553c9 100644
--- a/src/arch/riscv/Makefile.inc
+++ b/src/arch/riscv/Makefile.inc
@@ -25,15 +25,21 @@
 # suffixes in ARCH_SUFFIX_riscv.
 simple_riscv_flags = $(riscv_flags)

+ifeq ($(CONFIG_COMPILER_GCC),y)
+MARCH_SUFFIX=$(ARCH_SUFFIX_riscv)
+else
+MARCH_SUFFIX=
+endif
+
 ifeq ($(CCC_ANALYZER_OUTPUT_FORMAT),)
-riscv_flags += -march=$(CONFIG_RISCV_ARCH)$(ARCH_SUFFIX_riscv) -mabi=$(CONFIG_RISCV_ABI) -mcmodel=$(CONFIG_RISCV_CODEMODEL)
+riscv_flags += -march=$(CONFIG_RISCV_ARCH)$(MARCH_SUFFIX) -mabi=$(CONFIG_RISCV_ABI) -mcmodel=$(CONFIG_RISCV_CODEMODEL)
 simple_riscv_flags += -march=$(CONFIG_RISCV_ARCH) -mabi=$(CONFIG_RISCV_ABI) -mcmodel=$(CONFIG_RISCV_CODEMODEL)
 else
 riscv_flags += $(_rv_flags)
 simple_riscv_flags += $(_rv_flags)
 endif

-riscv_asm_flags = -march=$(CONFIG_RISCV_ARCH)$(ARCH_SUFFIX_riscv) -mabi=$(CONFIG_RISCV_ABI)
+riscv_asm_flags = -march=$(CONFIG_RISCV_ARCH)$(MARCH_SUFFIX) -mabi=$(CONFIG_RISCV_ABI)

COMPILER_RT_bootblock = $(shell $(GCC_bootblock) $(simple_riscv_flags) -print-libgcc-file-name)