Merge remote-tracking branch 'origin/develop'

2024-01-13 08:23:56 +01:00 · 2024-01-13 08:23:56 +01:00 · 7728785e27
parent 51c8a93336 fe1136c7ce
commit 7728785e27
2 changed files with 2 additions and 3 deletions
--- a/benchmarks/dhrystone/Makefile
+++ b/benchmarks/dhrystone/Makefile
@ -8,7 +8,7 @@ HEADERS := dhry.h
 BOARD=iss
 LINK_TARGET=link
 RISCV_ARCH:=rv32$(ISA)
-ifeq ($(ISA),e)
+ifneq (,$(findstring e,$(ISA)))
    RISCV_ABI:=ilp32e
 else
    RISCV_ABI:=ilp32
--- a/hello-world/Makefile
+++ b/hello-world/Makefile
@ -1,4 +1,3 @@
-
 TARGET  = hello
 ISA?=imc

@ -10,7 +9,7 @@ CFLAGS += $(OPT) -g
 BOARD=iss
 LINK_TARGET=link
 RISCV_ARCH:=rv32$(ISA)
-ifeq ($(ISA),e)
+ifneq (,$(findstring e,$(ISA)))
    RISCV_ABI:=ilp32e
 else
    RISCV_ABI:=ilp32