From 0693f7667672a931f99a7adc412c78d191ac94c3 Mon Sep 17 00:00:00 2001
From: David Harris <david_harris@hmc.edu>
Date: Tue, 1 Mar 2022 18:02:45 +0000
Subject: [PATCH] Fixed march compiling privileged tests to support AMO tests.

---
 .../riscv-test-suite/rv32i_m/privilege/Makefile                 | 2 +-
 .../riscv-test-suite/rv64i_m/privilege/Makefile                 | 2 +-
 .../riscv-test-suite/rv64i_m/privilege/Makefrag                 | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefile b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefile
index fb2c55ad6..e177848be 100644
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefile
+++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefile
@@ -1,3 +1,3 @@
 include ../../Makefile.include
 
-$(eval $(call compile_template,-march=rv32i -mabi=ilp32 -Drvtest_mtrap_routine=True -DXLEN=$(XLEN)))
+$(eval $(call compile_template,-march=rv32iac -mabi=ilp32 -Drvtest_mtrap_routine=True -DXLEN=$(XLEN)))
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefile b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefile
index c5a3eabd4..d70717f01 100644
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefile
+++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefile
@@ -1,3 +1,3 @@
 include ../../Makefile.include
 
-$(eval $(call compile_template,-march=rv64i -mabi=lp64 -Drvtest_mtrap_routine=True -DXLEN=$(XLEN)))
+$(eval $(call compile_template,-march=rv64iac -mabi=lp64 -Drvtest_mtrap_routine=True -DXLEN=$(XLEN)))
diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefrag b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefrag
index bdfaaa657..4b60965c2 100644
--- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefrag
+++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefrag
@@ -37,6 +37,7 @@ rv64i_sc_tests = \
     WALLY-misa-01 \
     WALLY-scratch-01 \
     WALLY-sscratch-s-01 \
+    WALLY-AMO \
 
 # Don't simulate these because they rely on SoC features that Wally does not offer.
 target_tests_nosim = \