From c36b437bacd40a91f29aa331aef4cdcdbff01b19 Mon Sep 17 00:00:00 2001
From: Marno <Marno.van-der-Maas@cl.cam.ac.uk>
Date: Mon, 1 Nov 2021 17:01:47 +0000
Subject: [PATCH] Revert to f126dbe

---
 .github/workflows/compile.yml | 6 +-----
 Makefile                      | 2 +-
 sail-riscv                    | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
index 4a5d2be1..799daf9e 100644
--- a/.github/workflows/compile.yml
+++ b/.github/workflows/compile.yml
@@ -13,11 +13,7 @@ jobs:
     - name: Init opam
       run: opam init --disable-sandboxing -y
     - name: Install sail
-      run: |
-        git clone https://github.com/rems-project/sail.git
-        cd sail
-        opam pin add sail .
-        cd ..
+      run: opam install -y sail
     - name: Check out repository code
       uses: actions/checkout@HEAD
       with:
diff --git a/Makefile b/Makefile
index a2e1a075..037448e3 100644
--- a/Makefile
+++ b/Makefile
@@ -198,7 +198,7 @@ ifneq (,$(SAILCOV))
 ALL_BRANCHES = generated_definitions/c/all_branches
 C_FLAGS += -DSAILCOV
 SAIL_FLAGS += -c_coverage $(ALL_BRANCHES) -c_include sail_coverage.h
-C_LIBS += $(SAIL_LIB_DIR)/coverage/libsail_coverage.a -lm -lpthread -ldl
+C_LIBS += $(SAIL_LIB_DIR)/coverage/libsail_coverage.a -lpthread -ldl
 endif
 
 # The C simulator can be built to be linked against Spike for tandem-verification.
diff --git a/sail-riscv b/sail-riscv
index 45080590..60776f92 160000
--- a/sail-riscv
+++ b/sail-riscv
@@ -1 +1 @@
-Subproject commit 4508059032ecfdb986a5673108b02900d2c4ccfd
+Subproject commit 60776f92c2f3e6ca02e1f40e27645a51ad1266af