diff options
| author | Alasdair Armstrong <alasdair.armstrong@cl.cam.ac.uk> | 2019-07-18 19:05:00 +0100 |
|---|---|---|
| committer | Alasdair Armstrong <alasdair.armstrong@cl.cam.ac.uk> | 2019-07-18 19:11:38 +0100 |
| commit | dfa3d509fce27079f68ec583b427b3d99ae597e4 (patch) | |
| tree | 93915aabf7e0923bc6df764092d17c9bf5c5ab14 /Makefile | |
| parent | 1714f50b4879329614064dcfd1cd1e14154711fe (diff) | |
| download | sail-riscv-dfa3d509fce27079f68ec583b427b3d99ae597e4.zip sail-riscv-dfa3d509fce27079f68ec583b427b3d99ae597e4.tar.gz sail-riscv-dfa3d509fce27079f68ec583b427b3d99ae597e4.tar.bz2 | |
Make sure everything builds correctly
Move updated 0.11 lem files from Shaked's commit into their own directory
Remove the 0.7.1 lem directory that performed a similar purpose during the prompt monad changes
Re-add model changes from Shaked's commit with a feature flag
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -127,12 +127,12 @@ endif # Feature detect if we are on the latest development version of Sail # and use an updated lem file if so. This is just until the opam -# version catches up with changes to the monad embedding. -SAIL_LATEST := $(shell $(SAIL) -emacs 1>&2 2> /dev/null; echo $$?) +# version catches up with changes to the barrier type. +SAIL_LATEST := $(shell $(SAIL) -has_feature FEATURE_UNION_BARRIERS 1>&2 2> /dev/null; echo $$?) ifeq ($(SAIL_LATEST),0) -RISCV_EXTRAS_LEM = riscv_extras.lem +RISCV_EXTRAS_LEM = 0.11/riscv_extras.lem else -RISCV_EXTRAS_LEM = 0.7.1/riscv_extras.lem +RISCV_EXTRAS_LEM = riscv_extras.lem endif all: ocaml_emulator/riscv_ocaml_sim_$(ARCH) c_emulator/riscv_sim_$(ARCH) riscv_isa riscv_coq riscv_hol riscv_rmem |