diff options
| author | Prashanth Mundkur <prashanth.mundkur@gmail.com> | 2019-07-22 14:46:48 -0700 |
|---|---|---|
| committer | Prashanth Mundkur <prashanth.mundkur@gmail.com> | 2019-07-22 14:46:48 -0700 |
| commit | bf32b39f88d88a9b5d1002b714190db5bdd2b8ec (patch) | |
| tree | 7442c8199b97311365afe32124bfb19e898e51c9 /Makefile | |
| parent | cc996651a3a756c862251e470dd21d9e19a4d420 (diff) | |
| parent | 7e6ffe27372f6d740e3f96ec94a3dc05047b5500 (diff) | |
| download | sail-riscv-bf32b39f88d88a9b5d1002b714190db5bdd2b8ec.zip sail-riscv-bf32b39f88d88a9b5d1002b714190db5bdd2b8ec.tar.gz sail-riscv-bf32b39f88d88a9b5d1002b714190db5bdd2b8ec.tar.bz2 | |
Merge branch 'master' into vmem_ext
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) -have_feature FEATURE_UNION_BARRIER 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 |