Revert to f126dbe

CTSRD-CHERI · Nov 1, 2021 · c36b437 · c36b437 · jrtc27 · Nov 1, 2021
1 parent 0101550
commit c36b437
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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