diff options
| author | Xavier Leroy <xavierleroy@users.noreply.github.com> | 2020-02-06 17:27:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-06 17:27:05 +0100 |
| commit | d5435a34169d92a96f1436128f3e90df7f4f9e9a (patch) | |
| tree | 51d678b64420e87bebe713b9a4c1aa043fb13685 | |
| parent | 6950ac8fb096768cb3811ae7f89d0db080bf965a (diff) | |
| download | compcert-kvx-d5435a34169d92a96f1436128f3e90df7f4f9e9a.tar.gz compcert-kvx-d5435a34169d92a96f1436128f3e90df7f4f9e9a.zip | |
Compatibility with OCaml 4.10 (#214)
debug/DwarfPrinter.mli: unused functor parameter trigger warning 69,
replace by non-dependent functor type.
Makefile.extr: turn warning 69 (unused functor parameter) off
for extracted code
configure: accept OCaml versions above 4.09
configure: update messages for unsupported versions of OCaml and Coq
| -rw-r--r-- | Makefile.extr | 4 | ||||
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | debug/DwarfPrinter.mli | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.extr b/Makefile.extr index 7b59ed24..5948bfc6 100644 --- a/Makefile.extr +++ b/Makefile.extr @@ -50,8 +50,8 @@ INCLUDES=$(patsubst %,-I %, $(DIRS)) # Control of warnings: WARNINGS=-w +a-4-9-27 -strict-sequence -safe-string -warn-error +a #Deprication returns with ocaml 4.03 -extraction/%.cmx: WARNINGS +=-w -20-27-32..34-39-41-44..45-60 -extraction/%.cmo: WARNINGS +=-w -20-27-32..34-39-41-44..45-60 +extraction/%.cmx: WARNINGS +=-w -20-27-32..34-39-41-44..45-60-67 +extraction/%.cmo: WARNINGS +=-w -20-27-32..34-39-41-44..45-60-67 cparser/pre_parser.cmx: WARNINGS += -w -41 cparser/pre_parser.cmo: WARNINGS += -w -41 @@ -537,7 +537,7 @@ case "$coq_ver" in if $ignore_coq_version; then echo "Warning: this version of Coq is unsupported, proceed at your own risks." else - echo "Error: CompCert requires one of the following Coq versions: 8.10.1, 8.10.0, 8.9.1, 8.9.0, 8.8.2, 8.8.1, 8.8.0" + echo "Error: CompCert requires one of the following Coq versions: 8.11.0, 8.10.2, 8.10.1, 8.10.0, 8.9.1, 8.9.0, 8.8.2, 8.8.1, 8.8.0" missingtools=true fi;; "") @@ -553,15 +553,15 @@ case "$ocaml_ver" in echo "version $ocaml_ver -- UNSUPPORTED" echo "Error: CompCert requires OCaml version 4.05 or later." missingtools=true;; - 4.0*) + 4.*) echo "version $ocaml_ver -- good!";; ?.*) echo "version $ocaml_ver -- UNSUPPORTED" - echo "Error: CompCert requires OCaml version 4.02 or later." + echo "Error: CompCert requires OCaml version 4.05 or later." missingtools=true;; *) echo "NOT FOUND" - echo "Error: make sure OCaml version 4.02 or later is installed." + echo "Error: make sure OCaml version 4.05 or later is installed." missingtools=true;; esac diff --git a/debug/DwarfPrinter.mli b/debug/DwarfPrinter.mli index e1e10601..78dc05fb 100644 --- a/debug/DwarfPrinter.mli +++ b/debug/DwarfPrinter.mli @@ -12,7 +12,7 @@ open DwarfTypes -module DwarfPrinter: functor (Target: DWARF_TARGET) -> +module DwarfPrinter: DWARF_TARGET -> sig val print_debug: out_channel -> debug_entries -> unit end |