Skip to content

Commit d5435a3

Browse files
authored
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
1 parent 6950ac8 commit d5435a3

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Makefile.extr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ INCLUDES=$(patsubst %,-I %, $(DIRS))
5050
# Control of warnings:
5151

5252
WARNINGS=-w +a-4-9-27 -strict-sequence -safe-string -warn-error +a #Deprication returns with ocaml 4.03
53-
extraction/%.cmx: WARNINGS +=-w -20-27-32..34-39-41-44..45-60
54-
extraction/%.cmo: WARNINGS +=-w -20-27-32..34-39-41-44..45-60
53+
extraction/%.cmx: WARNINGS +=-w -20-27-32..34-39-41-44..45-60-67
54+
extraction/%.cmo: WARNINGS +=-w -20-27-32..34-39-41-44..45-60-67
5555
cparser/pre_parser.cmx: WARNINGS += -w -41
5656
cparser/pre_parser.cmo: WARNINGS += -w -41
5757

configure

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ case "$coq_ver" in
537537
if $ignore_coq_version; then
538538
echo "Warning: this version of Coq is unsupported, proceed at your own risks."
539539
else
540-
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"
540+
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"
541541
missingtools=true
542542
fi;;
543543
"")
@@ -553,15 +553,15 @@ case "$ocaml_ver" in
553553
echo "version $ocaml_ver -- UNSUPPORTED"
554554
echo "Error: CompCert requires OCaml version 4.05 or later."
555555
missingtools=true;;
556-
4.0*)
556+
4.*)
557557
echo "version $ocaml_ver -- good!";;
558558
?.*)
559559
echo "version $ocaml_ver -- UNSUPPORTED"
560-
echo "Error: CompCert requires OCaml version 4.02 or later."
560+
echo "Error: CompCert requires OCaml version 4.05 or later."
561561
missingtools=true;;
562562
*)
563563
echo "NOT FOUND"
564-
echo "Error: make sure OCaml version 4.02 or later is installed."
564+
echo "Error: make sure OCaml version 4.05 or later is installed."
565565
missingtools=true;;
566566
esac
567567

debug/DwarfPrinter.mli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
open DwarfTypes
1414

15-
module DwarfPrinter: functor (Target: DWARF_TARGET) ->
15+
module DwarfPrinter: DWARF_TARGET ->
1616
sig
1717
val print_debug: out_channel -> debug_entries -> unit
1818
end

0 commit comments

Comments
 (0)