From ef35dc859d21bfeb6ea1b16815551507a952adde Mon Sep 17 00:00:00 2001
From: Luke Wren <wren6991@gmail.com>
Date: Tue, 24 May 2022 16:17:07 +0100
Subject: [PATCH] Add zicsr to march in makefiles

---
 test/sim/coremark/dist/barebones/core_portme.mak | 4 ++--
 test/sim/dhrystone/Makefile                      | 2 +-
 test/sim/hellow/Makefile                         | 3 ++-
 test/sim/sw_testcases/Makefile                   | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/sim/coremark/dist/barebones/core_portme.mak b/test/sim/coremark/dist/barebones/core_portme.mak
index b12a31b..e72ad5d 100755
--- a/test/sim/coremark/dist/barebones/core_portme.mak
+++ b/test/sim/coremark/dist/barebones/core_portme.mak
@@ -24,7 +24,7 @@ LD		= riscv32-unknown-elf-gcc
 AS		= riscv32-unknown-elf-gcc
 # Flag : CFLAGS
 #	Use this flag to define compiler options. Note, you can add compiler options from the command line using XCFLAGS="other flags"
-PORT_CFLAGS = -O3 -g -march=rv32imc -fno-common -funroll-loops -finline-functions --param max-inline-insns-auto=20 -falign-functions=4 -falign-jumps=4 -falign-loops=4
+PORT_CFLAGS = -O3 -g -march=rv32imc_zicsr_zba_zbb_zbc_zbs -fno-common -funroll-loops -finline-functions --param max-inline-insns-auto=20 -falign-functions=4 -falign-jumps=4 -falign-loops=4
 FLAGS_STR = "$(PORT_CFLAGS) $(XCFLAGS) $(XLFLAGS) $(LFLAGS_END)"
 CFLAGS = $(PORT_CFLAGS) -I$(PORT_DIR) -I. -DFLAGS_STR=\"$(FLAGS_STR)\" 
 #Flag : LFLAGS_END
@@ -35,7 +35,7 @@ SEPARATE_COMPILE=1
 # You must also define below how to create an object file, and how to link.
 OBJOUT 	= -o
 LFLAGS 	= -T ../../common/memmap.ld
-ASFLAGS = -c
+ASFLAGS = -c -march=rv32imc_zicsr
 OFLAG 	= -o
 COUT 	= -c
 
diff --git a/test/sim/dhrystone/Makefile b/test/sim/dhrystone/Makefile
index 8ed9b58..eb2db86 100644
--- a/test/sim/dhrystone/Makefile
+++ b/test/sim/dhrystone/Makefile
@@ -1,6 +1,6 @@
 SRCS       := ../common/init.S src/dhrystone_main.c src/dhrystone.c src/util.c
 APP        := dhrystone
-CCFLAGS    := -O3 -fno-inline -march=rv32im
+CCFLAGS    := -O3 -fno-inline -march=rv32im_zicsr
 MAX_CYCLES := 1000000
 
 include ../common/src_only_app.mk
diff --git a/test/sim/hellow/Makefile b/test/sim/hellow/Makefile
index e5b4219..77daff4 100644
--- a/test/sim/hellow/Makefile
+++ b/test/sim/hellow/Makefile
@@ -1,5 +1,6 @@
 SRCS := ../common/init.S main.c
 APP  := hellow
-CCFLAGS = -march=rv32imc -Os
+CCFLAGS = -march=rv32i_zicsr_zba_zbb_zbc_zbs -Os
+AFLAGS = -march=rv32i_zicsr_zba_zbb_zbc_zbs
 
 include ../common/src_only_app.mk
diff --git a/test/sim/sw_testcases/Makefile b/test/sim/sw_testcases/Makefile
index d98da03..7f8591c 100644
--- a/test/sim/sw_testcases/Makefile
+++ b/test/sim/sw_testcases/Makefile
@@ -1,6 +1,6 @@
 APP        := hellow
 SRCS       := ../common/init.S $(APP).c
-CCFLAGS    := -march=rv32imac -Os
+CCFLAGS    := -march=rv32imac_zicsr -Os
 MAX_CYCLES := 1000000
 INCDIR     := include ../common