Skip to content

Commit d737533

Browse files
committed
minor fixes after merge
1 parent f1710d6 commit d737533

File tree

4 files changed

+32
-25
lines changed

4 files changed

+32
-25
lines changed

driver/main_args.ml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -940,6 +940,9 @@ let mk_afl_inst_ratio f =
940940
\ (advanced, see afl-fuzz docs for AFL_INST_RATIO)"
941941
;;
942942

943+
let mk_alloc_check f =
944+
"-alloc-check", Arg.Unit f, "<ignored>"
945+
943946
let mk__ f =
944947
"-", Arg.String f,
945948
"<file> Treat <file> as a file name (even if it starts with `-')"
@@ -1172,6 +1175,7 @@ module type Optcomp_options = sig
11721175
val _save_ir_after : string -> unit
11731176
val _probes : unit -> unit
11741177
val _no_probes : unit -> unit
1178+
val _alloc_check : unit -> unit
11751179
end;;
11761180

11771181
module type Opttop_options = sig
@@ -1541,6 +1545,7 @@ struct
15411545
mk_dump_into_file F._dump_into_file;
15421546
mk_dump_dir F._dump_dir;
15431547
mk_dump_pass F._dump_pass;
1548+
mk_alloc_check F._alloc_check;
15441549

15451550
mk_args F._args;
15461551
mk_args0 F._args0;
@@ -2024,6 +2029,7 @@ module Default = struct
20242029
let _v () = Compenv.print_version_and_library "native-code compiler"
20252030
let _no_probes = clear probes
20262031
let _probes = set probes
2032+
let _alloc_check () = ()
20272033
end
20282034

20292035
module Odoc_args = struct

driver/main_args.mli

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ module type Optcomp_options = sig
243243
val _save_ir_after : string -> unit
244244
val _probes : unit -> unit
245245
val _no_probes : unit -> unit
246+
val _alloc_check : unit -> unit
246247
end;;
247248

248249
module type Opttop_options = sig

dune

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
;; CR gyorsh: it is not clear what the ":standard" flags are, and they
2626
;; may change depending on the version of dune.
2727
;; Consider hard-coded flags, such as -O3.
28-
(:standard -alloc-check -caml-apply-inline-fast-path)))
28+
(:standard -alloc-check)))
2929
(boot
3030
(flags
3131
(:standard -warn-error +A))))

toplevel/native/dune

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,30 @@
1212
;* *
1313
;**************************************************************************
1414

15-
; (copy_files# ../*.ml*)
16-
;
17-
; (library
18-
; (name ocamltoplevel_native)
19-
; (wrapped false)
20-
; (modes native)
21-
; (flags (:standard -principal))
22-
; (libraries ocamlcommon ocamloptcomp dynlink_internal)
23-
; (modules :standard \ topstart expunge))
24-
;
25-
; (executable
26-
; (name topstart)
27-
; (modes native)
28-
; (flags (:standard -principal))
29-
; (modules topstart)
30-
; (libraries ocamltoplevel_native))
31-
;
32-
; (install
33-
; (files
34-
; (topstart.exe as ocamlnat)
35-
; )
36-
; (section bin)
37-
; (package ocaml))
38-
;
15+
(copy_files# ../*.ml*)
16+
17+
(library
18+
(name ocamltoplevel_native)
19+
(wrapped false)
20+
(modes native)
21+
(flags (:standard -principal))
22+
(libraries ocamlcommon ocamloptcomp dynlink_internal)
23+
(modules :standard \ topstart expunge))
24+
25+
(executable
26+
(name topstart)
27+
(modes native)
28+
(flags (:standard -principal))
29+
(modules topstart)
30+
(libraries ocamltoplevel_native))
31+
32+
(install
33+
(files
34+
(topstart.exe as ocamlnat)
35+
)
36+
(section bin)
37+
(package ocaml))
38+
3939
;
4040
; (install
4141
; (files

0 commit comments

Comments
 (0)