New upstream version 4.08.1

diff --git a/.depend b/.depend
index 19f8c5d7792458adaac115de8bde8188097f2f31..cea6ca97a0903628006caa8ba3738929bf68c23c 100644 (file)
--- a/.depend
+++ b/.depend
@@ -1705,6 +1705,7 @@ bytecomp/bytepackager.cmo : \
     typing/typemod.cmi \
     bytecomp/translmod.cmi \
     typing/subst.cmi \
+    bytecomp/simplif.cmi \
     bytecomp/printlambda.cmi \
     typing/path.cmi \
     utils/misc.cmi \
@@ -1724,6 +1725,7 @@ bytecomp/bytepackager.cmx : \
     typing/typemod.cmx \
     bytecomp/translmod.cmx \
     typing/subst.cmx \
+    bytecomp/simplif.cmx \
     bytecomp/printlambda.cmx \
     typing/path.cmx \
     utils/misc.cmx \
@@ -2483,6 +2485,7 @@ asmcomp/asmlink.cmi : \
 asmcomp/asmpackager.cmo : \
     typing/typemod.cmi \
     bytecomp/translmod.cmi \
+    bytecomp/simplif.cmi \
     utils/profile.cmi \
     utils/misc.cmi \
     middle_end/middle_end.cmi \
@@ -2505,6 +2508,7 @@ asmcomp/asmpackager.cmo : \
 asmcomp/asmpackager.cmx : \
     typing/typemod.cmx \
     bytecomp/translmod.cmx \
+    bytecomp/simplif.cmx \
     utils/profile.cmx \
     utils/misc.cmx \
     middle_end/middle_end.cmx \

diff --git a/Changes b/Changes
index 304784531cf0b72fa6f91ead34613b953f630baa..670abe75f0950d3f380927503a0740f9f36c598e 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,30 @@
+OCaml 4.08.1 (5 August 2019)
+----------------------------
+
+### Bug fixes:
+
+- #7887: ensure frame table is 8-aligned on ARM64 and PPC64
+  (Xavier Leroy, report by Mark Hayden, review by Mark Shinwell
+   and Gabriel Scherer)
+
+- #8751: fix bug that could result in misaligned data section when compiling to
+  native-code on amd64.  (observed with the mingw64 compiler)
+  (Nicolás Ojeda Bär, review by David Allsopp)
+
+- #8769, #8770: Fix assertion failure with -pack
+  (Leo White, review by Gabriel Scherer, report by Fabian @copy)
+
+- #8816, #8818: fix loading of packed modules with Dynlink (regression in
+  #2176).
+  (Leo White, report by Andre Maroneze, review by Gabriel Scherer)
+
+- #8830: configure script: fix tool prefix detection and Debian's armhf
+  detection
+  (Stéphane Glondu, review by David Allsopp)
+
+- #8843, #8841: fix use of off_t on 32-bit systems.
+  (Stephen Dolan, report by Richard Jones, review by Xavier Leroy)
+
 OCaml 4.08.0 (13 June 2019)
 ---------------------------
 

diff --git a/HACKING.adoc b/HACKING.adoc
index 93c6e4fe67089d9d2082eec6c5ed7847eef39d11..3941a6f372c04a96b41b859ebf3d962dfc184a95 100644 (file)
--- a/HACKING.adoc
+++ b/HACKING.adoc
@@ -229,6 +229,10 @@ installation, the following targets may be of use:
 
 `make -C testsuite parallel`:: see link:testsuite/HACKING.adoc[]
 
+Additionally, there are some developer specific targets in link:Makefile.dev[].
+These targets are automatically available when working in a Git clone of the
+repository, but are not available from a tarball.
+
 === Bootstrapping
 
 The OCaml compiler is bootstrapped. This means that

diff --git a/Makefile b/Makefile
index 2a9413a97a89e1e6efa4fe6f945bf1f89da517b7..83598d6c4991df09aad89cc05436ed24edfcaa52 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1279,34 +1279,9 @@ partialclean::
 
 beforedepend:: bytecomp/opcodes.ml
 
-# Testing the parser -- see parsing/HACKING.adoc
-
-SOURCE_FILES=$(shell git ls-files '*.ml' '*.mli' | grep -v boot/menhir/parser)
-
-AST_FILES=$(addsuffix .ast,$(SOURCE_FILES))
-
-build-all-asts: $(AST_FILES)
-
-CAMLC_DPARSETREE := \
-       $(CAMLRUN) ./ocamlc -nostdlib -nopervasives \
-         -stop-after parsing -dparsetree
-
-%.ml.ast: %.ml ocamlc
-       $(CAMLC_DPARSETREE) $< 2> $@ || exit 0
-# `|| exit 0` : some source files will fail to parse
-# (for example, they are meant as toplevel scripts
-# rather than source files, or are parse-error tests),
-# we ignore the failure in that case
-
-%.mli.ast: %.mli ocamlc
-       $(CAMLC_DPARSETREE) $< 2> $@ || exit 0
-
-.PHONY: list-all-asts
-list-all-asts:
-       @for f in $(AST_FILES); do echo "'$$f'"; done
-
-partialclean::
-       rm -f $(AST_FILES)
+ifneq "$(wildcard .git)" ""
+include Makefile.dev
+endif
 
 # Default rules
 

diff --git a/Makefile.dev b/Makefile.dev
new file mode 100644 (file)
index 0000000..de69a1b
--- /dev/null
+++ b/Makefile.dev
@@ -0,0 +1,48 @@
+#**************************************************************************
+#*                                                                        *
+#*                                 OCaml                                  *
+#*                                                                        *
+#*            Gabriel Scherer, projet Parsifal, INRIA Saclay              *
+#*                                                                        *
+#*   Copyright 2018 Institut National de Recherche en Informatique et     *
+#*     en Automatique.                                                    *
+#*                                                                        *
+#*   All rights reserved.  This file is distributed under the terms of    *
+#*   the GNU Lesser General Public License version 2.1, with the          *
+#*   special exception on linking described in the file LICENSE.          *
+#*                                                                        *
+#**************************************************************************
+
+# Developer-only rules, included in Makefile when a Git repository is detected.
+
+# Testing the parser -- see parsing/HACKING.adoc
+
+SOURCE_FILES=$(shell git ls-files '*.ml' '*.mli' | grep -v boot/menhir/parser)
+
+AST_FILES=$(addsuffix .ast,$(SOURCE_FILES))
+
+build-all-asts:
+# Recursive invocation ensures that `git ls-files` is not executed on every
+# invocation of make
+       @$(MAKE) --no-print-directory $(AST_FILES)
+
+CAMLC_DPARSETREE := \
+       $(CAMLRUN) ./ocamlc -nostdlib -nopervasives \
+         -stop-after parsing -dparsetree
+
+%.ml.ast: %.ml ocamlc
+       $(CAMLC_DPARSETREE) $< 2> $@ || exit 0
+# `|| exit 0` : some source files will fail to parse
+# (for example, they are meant as toplevel scripts
+# rather than source files, or are parse-error tests),
+# we ignore the failure in that case
+
+%.mli.ast: %.mli ocamlc
+       $(CAMLC_DPARSETREE) $< 2> $@ || exit 0
+
+.PHONY: list-all-asts
+list-all-asts:
+       @for f in $(AST_FILES); do echo "'$$f'"; done
+
+partialclean::
+       rm -f $(AST_FILES)

diff --git a/VERSION b/VERSION
index 5612695a783982e8c94b0088ff81593bb981ef54..2c3d7f9496cc80044b8218b5c2ad823cf4fa4d21 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-4.08.0
+4.08.1
 
 # The version string is the first line of this file.
 # It must be in the format described in stdlib/sys.mli

diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp
index e984ed56d4dbaf777da84dcf55839c97cf5a5e9f..4acbd694afabec2f7e851faed165818014e1cf82 100644 (file)
--- a/asmcomp/amd64/emit.mlp
+++ b/asmcomp/amd64/emit.mlp
@@ -965,6 +965,7 @@ let emit_item = function
 
 let data l =
   D.data ();
+  D.align 8;
   List.iter emit_item l
 
 (* Beginning / end of an assembly file *)

diff --git a/asmcomp/arm64/emit.mlp b/asmcomp/arm64/emit.mlp
index 8c855b8de81eb571c463b58d659e3e2e868a264c..5879266358a59cebfc78a56b2f1e17f992af56a5 100644 (file)
--- a/asmcomp/arm64/emit.mlp
+++ b/asmcomp/arm64/emit.mlp
@@ -993,7 +993,8 @@ let end_assembly () =
   `    .quad   0\n`;  (* PR#6329 *)
   `    .globl  {emit_symbol lbl_end}\n`;
   `{emit_symbol lbl_end}:\n`;
-  `    .long   0\n`;
+  `    .quad   0\n`;
+  `    .align  3\n`;  (* #7887 *)
   let lbl = Compilenv.make_symbol (Some "frametable") in
   `    .globl  {emit_symbol lbl}\n`;
   `{emit_symbol lbl}:\n`;

diff --git a/asmcomp/asmpackager.ml b/asmcomp/asmpackager.ml
index cddb34631d1dd8c80381532fc41784473b78fb54..f079e0e6a803677c00834554cc8cbd8a67f0afd6 100644 (file)
--- a/asmcomp/asmpackager.ml
+++ b/asmcomp/asmpackager.ml
@@ -101,6 +101,7 @@ let make_package_object ~ppf_dump members targetobj targetname coercion
     let prefixname = Filename.remove_extension objtemp in
     if Config.flambda then begin
       let size, lam = Translmod.transl_package_flambda components coercion in
+      let lam = Simplif.simplify_lambda targetname lam in
       let flam =
         Middle_end.middle_end ~ppf_dump
           ~prefixname
@@ -116,6 +117,7 @@ let make_package_object ~ppf_dump members targetobj targetname coercion
       let main_module_block_size, code =
         Translmod.transl_store_package
           components (Ident.create_persistent targetname) coercion in
+      let code = Simplif.simplify_lambda targetname code in
       Asmgen.compile_implementation_clambda
         prefixname ~ppf_dump { Lambda.code; main_module_block_size;
                          module_ident; required_globals = Ident.Set.empty }

diff --git a/asmcomp/cmmgen.ml b/asmcomp/cmmgen.ml
index d0490998c690876c561463cb501a2efcc25893b1..68e36d0d9e0bf4f2e1f19ec55e44ed1db91e0609 100644 (file)
--- a/asmcomp/cmmgen.ml
+++ b/asmcomp/cmmgen.ml
@@ -1528,8 +1528,8 @@ end
    phases, we only share exits *)
 (* Some specific patterns can lead to switches where several cases
    point to the same action, but this action is not an exit (see GPR#1370).
-   The addition of the index in the action array as context allows to
-   share them correctly without duplication. *)
+   The addition of the index in the action array as context allows
+   sharing them correctly without duplication. *)
 module StoreExpForSwitch =
   Switch.CtxStore
     (struct

diff --git a/asmcomp/power/emit.mlp b/asmcomp/power/emit.mlp
index f4147c492d0b7459bb8030220ab4cc20ce321b56..b489fa995f8f6a3fba06c342524dc88dcfec2c81 100644 (file)
--- a/asmcomp/power/emit.mlp
+++ b/asmcomp/power/emit.mlp
@@ -1222,6 +1222,7 @@ let end_assembly() =
   `    {emit_string datag}     0\n`;
   (* Emit the frame descriptors *)
   emit_string data_space;  (* not rodata_space because it contains relocations *)
+  if ppc64 then `      .align  3\n`;   (* #7887 *)
   let lbl = Compilenv.make_symbol (Some "frametable") in
   declare_global_data lbl;
   `{emit_symbol lbl}:\n`;

diff --git a/boot/ocamlc b/boot/ocamlc
index 2bc0cd94412a16fa46e5b47bef3c609aed3a2ceb..4938ace50addf8fb828e59a6ebedf9a4b6554cc3 100755 (executable)
Binary files a/boot/ocamlc and b/boot/ocamlc differ

diff --git a/boot/ocamllex b/boot/ocamllex
index 6b5e83ce92e7288b337a5aaeb5bea98f9c3c9dda..893f709e4b52cf1fe6fca0a27d69e8137e0f487f 100755 (executable)
Binary files a/boot/ocamllex and b/boot/ocamllex differ

diff --git a/bytecomp/bytepackager.ml b/bytecomp/bytepackager.ml
index ba57ef94111c6f79186223f19c3665b1d83c99de..4c19f5c28077e86e6f96fe8fe04ef92fbdf07dd4 100644 (file)
--- a/bytecomp/bytepackager.ml
+++ b/bytecomp/bytepackager.ml
@@ -195,6 +195,7 @@ let build_global_target ~ppf_dump oc target_name members mapping pos coercion =
   let lam =
     Translmod.transl_package
       components (Ident.create_persistent target_name) coercion in
+  let lam = Simplif.simplify_lambda target_name lam in
   if !Clflags.dump_lambda then
     Format.fprintf ppf_dump "%a@." Printlambda.lambda lam;
   let instrs =

diff --git a/bytecomp/translmod.ml b/bytecomp/translmod.ml
index c48e4f6e7737e25f679accb1b3bdd6a75d79e7b5..436344f48451971f7091f20a694ff59a85453128 100644 (file)
--- a/bytecomp/translmod.ml
+++ b/bytecomp/translmod.ml
@@ -72,7 +72,10 @@ let rec apply_coercion loc strict restr arg =
       arg
   | Tcoerce_structure(pos_cc_list, id_pos_list) ->
       name_lambda strict arg (fun id ->
-        let get_field pos = Lprim(Pfield pos,[Lvar id], loc) in
+        let get_field pos =
+          if pos < 0 then lambda_unit
+          else Lprim(Pfield pos,[Lvar id], loc)
+        in
         let lam =
           Lprim(Pmakeblock(0, Immutable, None),
                 List.map (apply_coercion_field loc get_field) pos_cc_list,

diff --git a/configure b/configure
index 4e8ad00a5658ecb353361ccad121aab0f786ad59..9a78a455419c59e8ec001325268ebf0be7315e34 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OCaml 4.08.0.
+# Generated by GNU Autoconf 2.69 for OCaml 4.08.1.
 #
 # Report bugs to <caml-list@inria.fr>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='OCaml'
 PACKAGE_TARNAME='ocaml'
-PACKAGE_VERSION='4.08.0'
-PACKAGE_STRING='OCaml 4.08.0'
+PACKAGE_VERSION='4.08.1'
+PACKAGE_STRING='OCaml 4.08.1'
 PACKAGE_BUGREPORT='caml-list@inria.fr'
 PACKAGE_URL='http://www.ocaml.org'
 
@@ -802,6 +802,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -917,6 +918,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1169,6 +1171,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1306,7 +1317,7 @@ fi
 for ac_var in  exec_prefix prefix bindir sbindir libexecdir datarootdir \
                datadir sysconfdir sharedstatedir localstatedir includedir \
                oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-               libdir localedir mandir
+               libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1419,7 +1430,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OCaml 4.08.0 to adapt to many kinds of systems.
+\`configure' configures OCaml 4.08.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1459,6 +1470,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1489,7 +1501,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OCaml 4.08.0:";;
+     short | recursive ) echo "Configuration of OCaml 4.08.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1645,7 +1657,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OCaml configure 4.08.0
+OCaml configure 4.08.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2308,7 +2320,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OCaml $as_me 4.08.0, which was
+It was created by OCaml $as_me 4.08.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2657,8 +2669,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.08.0" >&5
-$as_echo "$as_me: Configuring OCaml version 4.08.0" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring OCaml version 4.08.1" >&5
+$as_echo "$as_me: Configuring OCaml version 4.08.1" >&6;}
 
 # Configuration variables
 
@@ -2733,7 +2745,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 ## Output variables
 
 
-VERSION=4.08.0
+VERSION=4.08.1
 
 
 # Note: This is present for the flexdll bootstrap where it exposed as the old
@@ -12353,7 +12365,7 @@ case $ocaml_cv_cc_vendor in #(
   msvc-*) :
     outputobj=-Fo; CPP="cl -nologo -EP"; gcc_warnings="" ;; #(
   *) :
-    outputobj='-o $(EMPTY)'; case 4.08.0 in #(
+    outputobj='-o $(EMPTY)'; case 4.08.1 in #(
   *+dev*) :
     gcc_warnings="-Wall -Werror" ;; #(
   *) :
@@ -12775,8 +12787,6 @@ _ACEOF
 
 fi
 
-$as_echo "#define HAS_OFF_T 1" >>confdefs.h
-
 
 # Checks for structures
 
@@ -13508,6 +13518,8 @@ fi; system=elf ;; #(
     arch=arm; model=armv5te; system=linux_eabi ;; #(
   armv5*-*-linux-gnueabi) :
     arch=arm; model=armv5; system=linux_eabi ;; #(
+  arm*-*-linux-gnueabihf) :
+    arch=arm; system=linux_eabihf ;; #(
   arm*-*-linux-gnueabi) :
     arch=arm; system=linux_eabi ;; #(
   arm*-*-openbsd*) :
@@ -13732,7 +13744,7 @@ case $host in #(
 esac
 
 if test -n "$host_alias"; then :
-  toolpref="${host}-"
+  toolpref="${host_alias}-"
 else
   toolpref=""
 fi
@@ -17548,7 +17560,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OCaml $as_me 4.08.0, which was
+This file was extended by OCaml $as_me 4.08.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17615,7 +17627,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-OCaml config.status 4.08.0
+OCaml config.status 4.08.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 5bb061162c80a7d0ac0738301cb9c702931da673..f5d8a2687bca02820be49069b7ee37ce791fc2a4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -670,7 +670,6 @@ AC_CHECK_HEADER([sys/select.h], [AC_DEFINE([HAS_SYS_SELECT_H])], [],
 
 ## off_t
 AC_TYPE_OFF_T
-AC_DEFINE([HAS_OFF_T])
 
 # Checks for structures
 
@@ -868,6 +867,8 @@ AS_CASE([$host],
     [arch=arm; model=armv5te; system=linux_eabi],
   [armv5*-*-linux-gnueabi],
     [arch=arm; model=armv5; system=linux_eabi],
+  [arm*-*-linux-gnueabihf],
+    [arch=arm; system=linux_eabihf],
   [arm*-*-linux-gnueabi],
     [arch=arm; system=linux_eabi],
   [arm*-*-openbsd*],
@@ -954,7 +955,7 @@ AS_CASE([$host],
   [*-*-mingw32|*-pc-windows], [asppprofflags=''],
   [asppprofflags='-DPROFILING'])
 
-AS_IF([test -n "$host_alias"], [toolpref="${host}-"], [toolpref=""])
+AS_IF([test -n "$host_alias"], [toolpref="${host_alias}-"], [toolpref=""])
 
 # We first compute default values for as and aspp
 # If values have been given by the user then they take precedence over

diff --git a/man/ocamldoc.m b/man/ocamldoc.m
index 7cc0948453faa5adedcabf351610fb0dc48cb6a9..ffdee529a806ddd474b8f8f0cb6a5f9c2e4f0112 100644 (file)
--- a/man/ocamldoc.m
+++ b/man/ocamldoc.m
@@ -160,7 +160,7 @@ Hide the given complete module names in the generated documentation.
 .I modules
 is a list of complete module names are separated by commas (,),
 without blanks. For instance:
-.IR Pervasives,M2.M3 .
+.IR Stdlib,M2.M3 .
 .TP
 .B \-inv\-merge\-ml\-mli
 Reverse the precedence of implementations and interfaces when merging.

diff --git a/manual/README.md b/manual/README.md
index d3f9fcd16bd592d6436d1d572d4a542c028acd92..52824d5ffe828d188c628f61f1c6ec67823304df 100644 (file)
--- a/manual/README.md
+++ b/manual/README.md
@@ -85,7 +85,7 @@ chapters (or sometimes sections) are mapped to a distinct `.etex` file:
     - The ocamlbuild compilation manager: `ocamlbuild.etex`
     - Interfacing C with OCaml: `intf-c.etex`
     - Optimisation with Flambda: `flambda.etex`
-    - Memory profiling with Spacetime: `spacetime.etex`
+    - Memory profiling with Spacetime: `spacetime-chapter.etex`
     - Fuzzing with afl-fuzz: `afl-fuzz.etex`
 
 Note that ocamlc,ocamlopt and the toplevel options overlap a lot.
@@ -98,7 +98,7 @@ of `unified-options.etex` contains the relevant information.
  This parts contains an brief presentation of all libraries bundled with the
  compilers and the api documentation generated for these libraries.
     - The core library: `core.etex`
-    - The standard library: `stdlib.etex`
+    - The standard library: `stdlib-blurb.etex`
     - The compiler front-end: `compilerlibs.etex`
     - The unix library: Unix system calls: `libunix.etex`
     - The legacy num library: this library has been removed from the core

diff --git a/manual/manual/allfiles.etex b/manual/manual/allfiles.etex
index d2b3b81e2f52e8b033a04c1aa46dc0fcf6346df5..d1eade0c276fe18fbe50be934442465b9fb1a2b6 100644 (file)
--- a/manual/manual/allfiles.etex
+++ b/manual/manual/allfiles.etex
@@ -63,7 +63,7 @@ and as a
 \input{runtime.tex}
 \input{native.tex}
 \input{lexyacc.tex}
-\input{depend.tex}
+\input{ocamldep.tex}
 \input{browser.tex}
 \input{ocamldoc.tex}
 \input{debugger.tex}
@@ -72,14 +72,14 @@ and as a
 % \input emacs.tex
 \input{intf-c.tex}
 \input{flambda.tex}
-\input{spacetime.tex}
+\input{spacetime-chapter.tex}
 \input{afl-fuzz.tex}
 \input{plugins}
 
 \part{The OCaml library}
 \label{p:library}
 \input{core.tex}
-\input{stdlib.tex}
+\input{stdlib-blurb.tex}
 \input{compilerlibs.tex}
 \input{libunix.tex}
 \input{libnum.tex}

diff --git a/manual/manual/cmds/Makefile b/manual/manual/cmds/Makefile
index c1dbacb34caa566e01fc6f5497991d21d2bb26cf..a6f478531e779d1e0a4bdb98c82e50c7f1544eac 100644 (file)
--- a/manual/manual/cmds/Makefile
+++ b/manual/manual/cmds/Makefile
@@ -11,11 +11,11 @@ TEXQUOTE = $(OCAMLRUN) $(TOOLS)/texquote2
 TRANSF = $(SET_LD_PATH) $(OCAMLRUN) $(TOOLS)/transf
 
 FILES = comp.tex top.tex runtime.tex native.tex lexyacc.tex intf-c.tex \
-  depend.tex profil.tex debugger.tex browser.tex ocamldoc.tex \
-  warnings-help.tex ocamlbuild.tex flambda.tex spacetime.tex \
+  ocamldep.tex profil.tex debugger.tex browser.tex ocamldoc.tex \
+  warnings-help.tex ocamlbuild.tex flambda.tex spacetime-chapter.tex \
   afl-fuzz.tex plugins.tex unified-options.tex
 
-WITH_TRANSF = top.tex intf-c.tex flambda.tex spacetime.tex \
+WITH_TRANSF = top.tex intf-c.tex flambda.tex spacetime-chapter.tex \
   afl-fuzz.tex lexyacc.tex debugger.tex
 
 WITH_CAMLEXAMPLE = ocamldoc.tex

diff --git a/manual/manual/cmds/depend.etex b/manual/manual/cmds/depend.etex
deleted file mode 100644 (file)
index 0069668..0000000
--- a/manual/manual/cmds/depend.etex
+++ /dev/null
@@ -1,221 +0,0 @@
-\chapter{Dependency generator (ocamldep)} \label{c:camldep}
-%HEVEA\cutname{depend.html}
-
-The "ocamldep" command scans a set of OCaml source files
-(".ml" and ".mli" files) for references to external compilation units,
-and outputs dependency lines in a format suitable for the "make"
-utility. This ensures that "make" will compile the source files in the
-correct order, and recompile those files that need to when a source
-file is modified.
-
-The typical usage is:
-\begin{alltt}
-        ocamldep \var{options} *.mli *.ml > .depend
-\end{alltt}
-where "*.mli *.ml" expands to all source files in the current
-directory and ".depend" is the file that should contain the
-dependencies. (See below for a typical "Makefile".)
-
-Dependencies are generated both for compiling with the bytecode
-compiler "ocamlc" and with the native-code compiler "ocamlopt".
-
-\section{Options}
-
-The following command-line options are recognized by "ocamldep".
-
-\begin{options}
-
-\item["-absname"]
-Show absolute filenames in error messages.
-
-\item["-all"]
-Generate dependencies on all required files, rather than assuming
-implicit dependencies.
-
-\item["-allow-approx"]
-Allow falling back on a lexer-based approximation when parsing fails.
-
-\item["-args" \var{filename}]
- Read additional newline-terminated command line arguments from \var{filename}.
-
-\item["-args0" \var{filename}]
- Read additional null character terminated command line arguments from \var{filename}.
-
-\item["-as-map"]
-For the following files, do not include delayed dependencies for
-module aliases.
-This option assumes that they are compiled using options
-"-no-alias-deps -w -49", and that those files or their interface are
-passed with the "-map" option when computing dependencies for other
-files. Note also that for dependencies to be correct in the
-implementation of a map file, its interface should not coerce any of
-the aliases it contains.
-
-\item["-debug-map"]
-Dump the delayed dependency map for each map file.
-
-\item["-I" \var{directory}]
-Add the given directory to the list of directories searched for
-source files. If a source file "foo.ml" mentions an external
-compilation unit "Bar", a dependency on that unit's interface
-"bar.cmi" is generated only if the source for "bar" is found in the
-current directory or in one of the directories specified with "-I".
-Otherwise, "Bar" is assumed to be a module from the standard library,
-and no dependencies are generated. For programs that span multiple
-directories, it is recommended to pass "ocamldep" the same "-I" options
-that are passed to the compiler.
-
-\item["-impl" \var{file}]
-Process \var{file} as a ".ml" file.
-
-\item["-intf" \var{file}]
-Process \var{file} as a ".mli" file.
-
-\item["-map" \var{file}]
-Read an propagate the delayed dependencies for module aliases in
-\var{file}, so that the following files will depend on the
-exported aliased modules if they use them. See the example below.
-
-\item["-ml-synonym" \var{.ext}]
-Consider the given extension (with leading dot) to be a synonym for .ml.
-
-\item["-mli-synonym" \var{.ext}]
-Consider the given extension (with leading dot) to be a synonym for .mli.
-
-\item["-modules"]
-Output raw dependencies of the form
-\begin{verbatim}
-      filename: Module1 Module2 ... ModuleN
-\end{verbatim}
-where "Module1", \ldots, "ModuleN" are the names of the compilation
-units referenced within the file "filename", but these names are not
-resolved to source file names.  Such raw dependencies cannot be used
-by "make", but can be post-processed by other tools such as "Omake".
-
-\item["-native"]
-Generate dependencies for a pure native-code program (no bytecode
-version).  When an implementation file (".ml" file) has no explicit
-interface file (".mli" file), "ocamldep" generates dependencies on the
-bytecode compiled file (".cmo" file) to reflect interface changes.
-This can cause unnecessary bytecode recompilations for programs that
-are compiled to native-code only.  The flag "-native" causes
-dependencies on native compiled files (".cmx") to be generated instead
-of on ".cmo" files.  (This flag makes no difference if all source files
-have explicit ".mli" interface files.)
-
-\item["-one-line"]
-Output one line per file, regardless of the length.
-
-\item["-open" \var{module}]
-Assume that module \var{module} is opened before parsing each of the
-following files.
-
-\item["-plugin" \var{plugin}]
-Dynamically load the code of the given \var{plugin}
-(a ".cmo", ".cma" or ".cmxs" file) in "ocamldep". \var{plugin} must exist in
-the same kind of code as "ocamldep" ("ocamldep.byte" must load bytecode
-plugins, while "ocamldep.opt" must load native code plugins), and
-extension adaptation is done automatically for ".cma" files (to ".cmxs" files
-if "ocamldep" is compiled in native code).
-
-\item["-pp" \var{command}]
-Cause "ocamldep" to call the given \var{command} as a preprocessor
-for each source file.
-
-\item["-ppx" \var{command}]
-Pipe abstract syntax trees through preprocessor \var{command}.
-
-\item["-shared"]
-Generate dependencies for native plugin files (.cmxs) in addition to
-native compiled files (.cmx).
-
-\item["-slash"]
-Under Windows, use a forward slash (/) as the path separator instead
-of the usual backward slash ($\backslash$).  Under Unix, this option does
-nothing.
-
-\item["-sort"]
-Sort files according to their dependencies.
-
-\item["-version"]
-Print version string and exit.
-
-\item["-vnum"]
-Print short version number and exit.
-
-\item["-help" or "--help"]
-Display a short usage summary and exit.
-%
-\end{options}
-
-\section{A typical Makefile}
-
-Here is a template "Makefile" for a OCaml program.
-
-\begin{verbatim}
-OCAMLC=ocamlc
-OCAMLOPT=ocamlopt
-OCAMLDEP=ocamldep
-INCLUDES=                 # all relevant -I options here
-OCAMLFLAGS=$(INCLUDES)    # add other options for ocamlc here
-OCAMLOPTFLAGS=$(INCLUDES) # add other options for ocamlopt here
-
-# prog1 should be compiled to bytecode, and is composed of three
-# units: mod1, mod2 and mod3.
-
-# The list of object files for prog1
-PROG1_OBJS=mod1.cmo mod2.cmo mod3.cmo
-
-prog1: $(PROG1_OBJS)
-        $(OCAMLC) -o prog1 $(OCAMLFLAGS) $(PROG1_OBJS)
-
-# prog2 should be compiled to native-code, and is composed of two
-# units: mod4 and mod5.
-
-# The list of object files for prog2
-PROG2_OBJS=mod4.cmx mod5.cmx
-
-prog2: $(PROG2_OBJS)
-        $(OCAMLOPT) -o prog2 $(OCAMLFLAGS) $(PROG2_OBJS)
-
-# Common rules
-.SUFFIXES: .ml .mli .cmo .cmi .cmx
-
-.ml.cmo:
-        $(OCAMLC) $(OCAMLFLAGS) -c $<
-
-.mli.cmi:
-        $(OCAMLC) $(OCAMLFLAGS) -c $<
-
-.ml.cmx:
-        $(OCAMLOPT) $(OCAMLOPTFLAGS) -c $<
-
-# Clean up
-clean:
-        rm -f prog1 prog2
-        rm -f *.cm[iox]
-
-# Dependencies
-depend:
-        $(OCAMLDEP) $(INCLUDES) *.mli *.ml > .depend
-
-include .depend
-\end{verbatim}
-
-If you use module aliases to give shorter names to modules, you need
-to change the above definitions. Assuming that your map file is called
-"mylib.mli", here are minimal modifications.
-\begin{verbatim}
-OCAMLFLAGS=$(INCLUDES) -open Mylib
-
-mylib.cmi: mylib.mli
-        $(OCAMLC) $(INCLUDES) -no-alias-deps -w -49 -c $<
-
-depend:
-        $(OCAMLDEP) $(INCLUDES) -map mylib.mli $(PROG1_OBJS:.cmo=.ml) > .depend
-\end{verbatim}
-Note that in this case you should not compute dependencies for
-"mylib.mli" together with the other files, hence the need to pass
-explicitly the list of files to process.
-If "mylib.mli" itself has dependencies, you should compute them using
-"-as-map".

diff --git a/manual/manual/cmds/intf-c.etex b/manual/manual/cmds/intf-c.etex
index ca5ff63b6ed1f1c1cb892bb701e5d6f51d9385a4..5cbaa94b7b36be98bd1e68144eb2dcefc3f420dd 100644 (file)
--- a/manual/manual/cmds/intf-c.etex
+++ b/manual/manual/cmds/intf-c.etex
@@ -23,11 +23,10 @@ User primitives are declared in an implementation file or
 \end{alltt}
 This defines the value name \var{name} as a function with type
 \var{type} that executes by calling the given C function.
-For instance, here is how the "input" primitive is declared in the
-standard library module "Pervasives":
+For instance, here is how the "int_of_string" primitive is declared in the
+standard library module "Stdlib":
 \begin{verbatim}
-        external input : in_channel -> bytes -> int -> int -> int
-                       = "input"
+        external int_of_string : string -> int = "caml_int_of_string"
 \end{verbatim}
 Primitives with several arguments are always curried. The C function
 does not necessarily have the same name as the ML function.
@@ -1624,10 +1623,10 @@ OCaml runtime explicitly, in order to avoid various system resource leaks.
 Since 4.05, "caml_shutdown" function can be used to shut the runtime down
 gracefully, which equals the following:
 \begin{itemize}
-\item Running the functions that were registered with "Pervasives.at_exit".
+\item Running the functions that were registered with "Stdlib.at_exit".
 \item Triggering finalization of allocated custom blocks (see
-section~\ref{s:custom}). For example, "Pervasives.in_channel" and
-"Pervasives.out_channel" are represented by custom blocks that enclose file
+section~\ref{s:custom}). For example, "Stdlib.in_channel" and
+"Stdlib.out_channel" are represented by custom blocks that enclose file
 descriptors, which are to be released.
 \item Unloading the dependent shared libraries that were loaded by the runtime,
 including "dynlink" plugins.

diff --git a/manual/manual/cmds/ocamldep.etex b/manual/manual/cmds/ocamldep.etex
new file mode 100644 (file)
index 0000000..0069668
--- /dev/null
+++ b/manual/manual/cmds/ocamldep.etex
@@ -0,0 +1,221 @@
+\chapter{Dependency generator (ocamldep)} \label{c:camldep}
+%HEVEA\cutname{depend.html}
+
+The "ocamldep" command scans a set of OCaml source files
+(".ml" and ".mli" files) for references to external compilation units,
+and outputs dependency lines in a format suitable for the "make"
+utility. This ensures that "make" will compile the source files in the
+correct order, and recompile those files that need to when a source
+file is modified.
+
+The typical usage is:
+\begin{alltt}
+        ocamldep \var{options} *.mli *.ml > .depend
+\end{alltt}
+where "*.mli *.ml" expands to all source files in the current
+directory and ".depend" is the file that should contain the
+dependencies. (See below for a typical "Makefile".)
+
+Dependencies are generated both for compiling with the bytecode
+compiler "ocamlc" and with the native-code compiler "ocamlopt".
+
+\section{Options}
+
+The following command-line options are recognized by "ocamldep".
+
+\begin{options}
+
+\item["-absname"]
+Show absolute filenames in error messages.
+
+\item["-all"]
+Generate dependencies on all required files, rather than assuming
+implicit dependencies.
+
+\item["-allow-approx"]
+Allow falling back on a lexer-based approximation when parsing fails.
+
+\item["-args" \var{filename}]
+ Read additional newline-terminated command line arguments from \var{filename}.
+
+\item["-args0" \var{filename}]
+ Read additional null character terminated command line arguments from \var{filename}.
+
+\item["-as-map"]
+For the following files, do not include delayed dependencies for
+module aliases.
+This option assumes that they are compiled using options
+"-no-alias-deps -w -49", and that those files or their interface are
+passed with the "-map" option when computing dependencies for other
+files. Note also that for dependencies to be correct in the
+implementation of a map file, its interface should not coerce any of
+the aliases it contains.
+
+\item["-debug-map"]
+Dump the delayed dependency map for each map file.
+
+\item["-I" \var{directory}]
+Add the given directory to the list of directories searched for
+source files. If a source file "foo.ml" mentions an external
+compilation unit "Bar", a dependency on that unit's interface
+"bar.cmi" is generated only if the source for "bar" is found in the
+current directory or in one of the directories specified with "-I".
+Otherwise, "Bar" is assumed to be a module from the standard library,
+and no dependencies are generated. For programs that span multiple
+directories, it is recommended to pass "ocamldep" the same "-I" options
+that are passed to the compiler.
+
+\item["-impl" \var{file}]
+Process \var{file} as a ".ml" file.
+
+\item["-intf" \var{file}]
+Process \var{file} as a ".mli" file.
+
+\item["-map" \var{file}]
+Read an propagate the delayed dependencies for module aliases in
+\var{file}, so that the following files will depend on the
+exported aliased modules if they use them. See the example below.
+
+\item["-ml-synonym" \var{.ext}]
+Consider the given extension (with leading dot) to be a synonym for .ml.
+
+\item["-mli-synonym" \var{.ext}]
+Consider the given extension (with leading dot) to be a synonym for .mli.
+
+\item["-modules"]
+Output raw dependencies of the form
+\begin{verbatim}
+      filename: Module1 Module2 ... ModuleN
+\end{verbatim}
+where "Module1", \ldots, "ModuleN" are the names of the compilation
+units referenced within the file "filename", but these names are not
+resolved to source file names.  Such raw dependencies cannot be used
+by "make", but can be post-processed by other tools such as "Omake".
+
+\item["-native"]
+Generate dependencies for a pure native-code program (no bytecode
+version).  When an implementation file (".ml" file) has no explicit
+interface file (".mli" file), "ocamldep" generates dependencies on the
+bytecode compiled file (".cmo" file) to reflect interface changes.
+This can cause unnecessary bytecode recompilations for programs that
+are compiled to native-code only.  The flag "-native" causes
+dependencies on native compiled files (".cmx") to be generated instead
+of on ".cmo" files.  (This flag makes no difference if all source files
+have explicit ".mli" interface files.)
+
+\item["-one-line"]
+Output one line per file, regardless of the length.
+
+\item["-open" \var{module}]
+Assume that module \var{module} is opened before parsing each of the
+following files.
+
+\item["-plugin" \var{plugin}]
+Dynamically load the code of the given \var{plugin}
+(a ".cmo", ".cma" or ".cmxs" file) in "ocamldep". \var{plugin} must exist in
+the same kind of code as "ocamldep" ("ocamldep.byte" must load bytecode
+plugins, while "ocamldep.opt" must load native code plugins), and
+extension adaptation is done automatically for ".cma" files (to ".cmxs" files
+if "ocamldep" is compiled in native code).
+
+\item["-pp" \var{command}]
+Cause "ocamldep" to call the given \var{command} as a preprocessor
+for each source file.
+
+\item["-ppx" \var{command}]
+Pipe abstract syntax trees through preprocessor \var{command}.
+
+\item["-shared"]
+Generate dependencies for native plugin files (.cmxs) in addition to
+native compiled files (.cmx).
+
+\item["-slash"]
+Under Windows, use a forward slash (/) as the path separator instead
+of the usual backward slash ($\backslash$).  Under Unix, this option does
+nothing.
+
+\item["-sort"]
+Sort files according to their dependencies.
+
+\item["-version"]
+Print version string and exit.
+
+\item["-vnum"]
+Print short version number and exit.
+
+\item["-help" or "--help"]
+Display a short usage summary and exit.
+%
+\end{options}
+
+\section{A typical Makefile}
+
+Here is a template "Makefile" for a OCaml program.
+
+\begin{verbatim}
+OCAMLC=ocamlc
+OCAMLOPT=ocamlopt
+OCAMLDEP=ocamldep
+INCLUDES=                 # all relevant -I options here
+OCAMLFLAGS=$(INCLUDES)    # add other options for ocamlc here
+OCAMLOPTFLAGS=$(INCLUDES) # add other options for ocamlopt here
+
+# prog1 should be compiled to bytecode, and is composed of three
+# units: mod1, mod2 and mod3.
+
+# The list of object files for prog1
+PROG1_OBJS=mod1.cmo mod2.cmo mod3.cmo
+
+prog1: $(PROG1_OBJS)
+        $(OCAMLC) -o prog1 $(OCAMLFLAGS) $(PROG1_OBJS)
+
+# prog2 should be compiled to native-code, and is composed of two
+# units: mod4 and mod5.
+
+# The list of object files for prog2
+PROG2_OBJS=mod4.cmx mod5.cmx
+
+prog2: $(PROG2_OBJS)
+        $(OCAMLOPT) -o prog2 $(OCAMLFLAGS) $(PROG2_OBJS)
+
+# Common rules
+.SUFFIXES: .ml .mli .cmo .cmi .cmx
+
+.ml.cmo:
+        $(OCAMLC) $(OCAMLFLAGS) -c $<
+
+.mli.cmi:
+        $(OCAMLC) $(OCAMLFLAGS) -c $<
+
+.ml.cmx:
+        $(OCAMLOPT) $(OCAMLOPTFLAGS) -c $<
+
+# Clean up
+clean:
+        rm -f prog1 prog2
+        rm -f *.cm[iox]
+
+# Dependencies
+depend:
+        $(OCAMLDEP) $(INCLUDES) *.mli *.ml > .depend
+
+include .depend
+\end{verbatim}
+
+If you use module aliases to give shorter names to modules, you need
+to change the above definitions. Assuming that your map file is called
+"mylib.mli", here are minimal modifications.
+\begin{verbatim}
+OCAMLFLAGS=$(INCLUDES) -open Mylib
+
+mylib.cmi: mylib.mli
+        $(OCAMLC) $(INCLUDES) -no-alias-deps -w -49 -c $<
+
+depend:
+        $(OCAMLDEP) $(INCLUDES) -map mylib.mli $(PROG1_OBJS:.cmo=.ml) > .depend
+\end{verbatim}
+Note that in this case you should not compute dependencies for
+"mylib.mli" together with the other files, hence the need to pass
+explicitly the list of files to process.
+If "mylib.mli" itself has dependencies, you should compute them using
+"-as-map".

diff --git a/manual/manual/cmds/ocamldoc.etex b/manual/manual/cmds/ocamldoc.etex
index 484e6350c832d557f8b80640444e780882e3d6c8..e65a2937259525aa9fc372472a29cf728d585793 100644 (file)
--- a/manual/manual/cmds/ocamldoc.etex
+++ b/manual/manual/cmds/ocamldoc.etex
@@ -98,7 +98,7 @@ read with the "-load" option in a subsequent invocation of "ocamldoc".
 \item["-hide" \var{modules}]
 Hide the given complete module names in the generated documentation.
 \var{modules} is a list of complete module names separated
- by '","', without blanks.  For instance: "Pervasives,M2.M3".
+ by '","', without blanks.  For instance: "Stdlib,M2.M3".
 
 \item["-inv-merge-ml-mli"]
 Reverse the precedence of implementations and interfaces when merging.

diff --git a/manual/manual/cmds/plugins.etex b/manual/manual/cmds/plugins.etex
index 89d652ef32f37b37e44b44e45884c973079ccf5e..d870163f7612d69bd59600abfb48fab3c69ecbec 100644 (file)
--- a/manual/manual/cmds/plugins.etex
+++ b/manual/manual/cmds/plugins.etex
@@ -12,23 +12,23 @@ are based on the compiler library API. In complement, new hooks have been added
 the compiler to increase its flexibility.
 
 In particular, hooks are available in the
-\ifouthtml\ahref{libref/Pparse.html}{\texttt{Pparse} module}
+\ifouthtml\ahref{compilerlibref/Pparse.html}{\texttt{Pparse} module}
 \else\texttt{Pparse} module (see section~\ref{Pparse})\fi
 to transform the parsed abstract syntax tree, providing similar functionality
 to extension point based preprocessors.
 Other hooks are available to analyze the typed tree in the
-\ifouthtml\ahref{libref/Typemod.html}{\texttt{Typemod} module}
+\ifouthtml\ahref{compilerlibref/Typemod.html}{\texttt{Typemod} module}
 \else\texttt{Typemod} module (see section~\ref{Typemod})\fi
 after the type-checking phase of the compiler. Since the typed tree relies
 on numerous invariants that play a vital part in ulterior phases of the
 compiler, it is not possible however to transform the typed tree.
 Similarly, the intermediary lambda representation can be modified by using the
 hooks provided in the
-\ifouthtml\ahref{libref/Simplif.html}{\texttt{Simplif} module}
+\ifouthtml\ahref{compilerlibref/Simplif.html}{\texttt{Simplif} module}
 \else\texttt{Simplif} module (see section~\ref{Simplif})\fi.
 A plugin can also add new options to a tool through the
 "Clflags.add_arguments" function (see
-\ifouthtml\ahref{libref/Clflags.html}{\texttt{Clflags} module}
+\ifouthtml\ahref{compilerlibref/Clflags.html}{\texttt{Clflags} module}
 \else\texttt{Clflags} module (see section~\ref{Clflags})\fi).
 
 Plugins are dynamically loaded and need to be compiled in the same mode (i.e.

diff --git a/manual/manual/cmds/spacetime-chapter.etex b/manual/manual/cmds/spacetime-chapter.etex
new file mode 100644 (file)
index 0000000..0c39a2e
--- /dev/null
+++ b/manual/manual/cmds/spacetime-chapter.etex
@@ -0,0 +1,125 @@
+\chapter{Memory profiling with Spacetime}
+%HEVEA\cutname{spacetime.html}
+
+\section{Overview}
+
+Spacetime is the name given to functionality within the OCaml compiler that
+provides for accurate profiling of the memory behaviour of a program.
+Using Spacetime it is possible to determine the source of memory leaks
+and excess memory allocation quickly and easily.  Excess allocation slows
+programs down both by imposing a higher load on the garbage collector and
+reducing the cache locality of the program's code.  Spacetime provides
+full backtraces for every allocation that occurred on the OCaml heap
+during the lifetime of the program including those in C stubs.
+
+Spacetime only analyses the memory behaviour of a program with respect to
+the OCaml heap allocators and garbage collector.  It does not analyse
+allocation on the C heap.  Spacetime does not affect the memory behaviour
+of a program being profiled with the exception of any change caused by the
+overhead of profiling (see section\ \ref{runtimeoverhead})---for example
+the program running slower might cause it to allocate less memory in total.
+
+Spacetime is currently only available for x86-64 targets and has only been
+tested on Linux systems (although it is expected to work on most modern
+Unix-like systems and provision has been made for running under
+Windows). It is expected that the set of supported platforms will
+be extended in the future.
+
+\section{How to use it}
+
+\subsection{Building}
+
+To use Spacetime it is necessary to use an OCaml compiler that was
+configured with the {\tt -spacetime} option.  It is not possible to select
+Spacetime on a per-source-file basis or for a subset of files in a project;
+all files involved in the executable being profiled must be built with the
+Spacetime compiler.  Only native code compilation is supported (not
+bytecode).
+
+If the {\tt libunwind} library is not available on the system then it will
+not be possible for Spacetime to profile allocations occurring within
+C stubs.  If the {\tt libunwind} library is available but in an unusual
+location then that location may be specified to the {\tt configure} script
+using the {\tt -libunwinddir} option (or alternatively, using separate
+{\tt -libunwindinclude} and {\tt -libunwindlib} options).
+
+OPAM switches will be provided for Spacetime-configured compilers.
+
+Once the appropriate compiler has been selected the program should be
+built as normal (ensuring that all files are built with the Spacetime
+compiler---there is currently no protection to ensure this is the case, but
+it is essential).  For many uses it will not be necessary to change the
+code of the program to use the profiler.
+
+Spacetime-configured compilers run slower and occupy more memory than their
+counterparts.  It is hoped this will be fixed in the future as part of
+improved cross compilation support.
+
+\subsection{Running}
+
+Programs built with Spacetime instrumentation have a dependency on
+the {\tt libunwind} library unless that was unavailable at configure time or
+the {\tt -disable-libunwind} option was specified
+(see section\ \ref{runtimeoverhead}).
+
+Setting the {\tt OCAML\_SPACETIME\_INTERVAL} environment variable to an
+integer representing a number of milliseconds before running a program built
+with Spacetime will cause memory profiling to be in operation when the
+program is started.  The contents of the OCaml heap will be sampled each
+time the number of milliseconds that the program has spent executing since the
+last sample exceeds the given number.  (Note that the time base is combined
+user plus system time---{\em not} wall clock time.  This peculiarity may be
+changed in future.)
+
+The program being profiled must exit normally or be caused to exit using
+the {\tt SIGINT} signal (e.g. by pressing Ctrl+C).  When the program exits
+files will be written in the directory that was the working directory when
+the program was started.  One Spacetime file will be written for each
+process that was involved, indexed by process ID; there will normally only
+be one such.  The Spacetime files may be substantial.  The directory to which
+they are written may be overridden by setting
+the {\tt OCAML\_SPACETIME\_SNAPSHOT\_DIR} environment variable before the
+program is started.
+
+Instead of using the automatic snapshot facility described above it is also
+possible to manually control Spacetime profiling.  (The environment variables
+{\tt OCAML\_SPACETIME\_INTERVAL} and {\tt OCAML\_SPACETIME\_SNAPSHOT\_DIR}
+are then not relevant.)  Full documentation as regards this method of profiling
+is provided in the standard library documentation (section\ \ref{c:stdlib})
+for the {\tt Spacetime} module.
+
+\subsection{Analysis}
+
+The compiler distribution does not itself provide the facility for analysing
+Spacetime output files; this is left to external tools.  The first such tool
+will appear in OPAM as a package called {\tt prof_spacetime}.  That tool will
+provide interactive graphical and terminal-based visualisation of
+the results of profiling.
+
+\section{Runtime overhead}\label{runtimeoverhead}
+
+The runtime overhead imposed by Spacetime varies considerably depending on
+the particular program being profiled.  The overhead may be as low as
+ten percent---but more usually programs should be expected to run at perhaps
+a third or quarter of their normal speed.  It is expected that this overhead
+will be reduced in future versions of the compiler.
+
+Execution speed of instrumented programs may be increased by using a compiler
+configured with the {\tt -disable-libunwind} option.  This prevents collection
+of profiling information from C stubs.
+
+Programs running with Spacetime instrumentation consume significantly more
+memory than their non-instrumented counterparts.  It is expected that this
+memory overhead will also be reduced in the future.
+
+\section{For developers}
+
+The compiler distribution provides an ``{\tt otherlibs}'' library called
+{\tt raw\_spacetime\_lib} for decoding Spacetime files.  This library
+provides facilities to read not only memory profiling information but also
+the full dynamic call graph of the profiled program which is written into
+Spacetime output files.
+
+A library package {\tt spacetime\_lib} will be provided in OPAM
+to provide an interface for decoding profiling information at a higher
+level than that provided by {\tt raw\_spacetime\_lib}.

diff --git a/manual/manual/cmds/spacetime.etex b/manual/manual/cmds/spacetime.etex
deleted file mode 100644 (file)
index 0c39a2e..0000000
--- a/manual/manual/cmds/spacetime.etex
+++ /dev/null
@@ -1,125 +0,0 @@
-\chapter{Memory profiling with Spacetime}
-%HEVEA\cutname{spacetime.html}
-
-\section{Overview}
-
-Spacetime is the name given to functionality within the OCaml compiler that
-provides for accurate profiling of the memory behaviour of a program.
-Using Spacetime it is possible to determine the source of memory leaks
-and excess memory allocation quickly and easily.  Excess allocation slows
-programs down both by imposing a higher load on the garbage collector and
-reducing the cache locality of the program's code.  Spacetime provides
-full backtraces for every allocation that occurred on the OCaml heap
-during the lifetime of the program including those in C stubs.
-
-Spacetime only analyses the memory behaviour of a program with respect to
-the OCaml heap allocators and garbage collector.  It does not analyse
-allocation on the C heap.  Spacetime does not affect the memory behaviour
-of a program being profiled with the exception of any change caused by the
-overhead of profiling (see section\ \ref{runtimeoverhead})---for example
-the program running slower might cause it to allocate less memory in total.
-
-Spacetime is currently only available for x86-64 targets and has only been
-tested on Linux systems (although it is expected to work on most modern
-Unix-like systems and provision has been made for running under
-Windows). It is expected that the set of supported platforms will
-be extended in the future.
-
-\section{How to use it}
-
-\subsection{Building}
-
-To use Spacetime it is necessary to use an OCaml compiler that was
-configured with the {\tt -spacetime} option.  It is not possible to select
-Spacetime on a per-source-file basis or for a subset of files in a project;
-all files involved in the executable being profiled must be built with the
-Spacetime compiler.  Only native code compilation is supported (not
-bytecode).
-
-If the {\tt libunwind} library is not available on the system then it will
-not be possible for Spacetime to profile allocations occurring within
-C stubs.  If the {\tt libunwind} library is available but in an unusual
-location then that location may be specified to the {\tt configure} script
-using the {\tt -libunwinddir} option (or alternatively, using separate
-{\tt -libunwindinclude} and {\tt -libunwindlib} options).
-
-OPAM switches will be provided for Spacetime-configured compilers.
-
-Once the appropriate compiler has been selected the program should be
-built as normal (ensuring that all files are built with the Spacetime
-compiler---there is currently no protection to ensure this is the case, but
-it is essential).  For many uses it will not be necessary to change the
-code of the program to use the profiler.
-
-Spacetime-configured compilers run slower and occupy more memory than their
-counterparts.  It is hoped this will be fixed in the future as part of
-improved cross compilation support.
-
-\subsection{Running}
-
-Programs built with Spacetime instrumentation have a dependency on
-the {\tt libunwind} library unless that was unavailable at configure time or
-the {\tt -disable-libunwind} option was specified
-(see section\ \ref{runtimeoverhead}).
-
-Setting the {\tt OCAML\_SPACETIME\_INTERVAL} environment variable to an
-integer representing a number of milliseconds before running a program built
-with Spacetime will cause memory profiling to be in operation when the
-program is started.  The contents of the OCaml heap will be sampled each
-time the number of milliseconds that the program has spent executing since the
-last sample exceeds the given number.  (Note that the time base is combined
-user plus system time---{\em not} wall clock time.  This peculiarity may be
-changed in future.)
-
-The program being profiled must exit normally or be caused to exit using
-the {\tt SIGINT} signal (e.g. by pressing Ctrl+C).  When the program exits
-files will be written in the directory that was the working directory when
-the program was started.  One Spacetime file will be written for each
-process that was involved, indexed by process ID; there will normally only
-be one such.  The Spacetime files may be substantial.  The directory to which
-they are written may be overridden by setting
-the {\tt OCAML\_SPACETIME\_SNAPSHOT\_DIR} environment variable before the
-program is started.
-
-Instead of using the automatic snapshot facility described above it is also
-possible to manually control Spacetime profiling.  (The environment variables
-{\tt OCAML\_SPACETIME\_INTERVAL} and {\tt OCAML\_SPACETIME\_SNAPSHOT\_DIR}
-are then not relevant.)  Full documentation as regards this method of profiling
-is provided in the standard library documentation (section\ \ref{c:stdlib})
-for the {\tt Spacetime} module.
-
-\subsection{Analysis}
-
-The compiler distribution does not itself provide the facility for analysing
-Spacetime output files; this is left to external tools.  The first such tool
-will appear in OPAM as a package called {\tt prof_spacetime}.  That tool will
-provide interactive graphical and terminal-based visualisation of
-the results of profiling.
-
-\section{Runtime overhead}\label{runtimeoverhead}
-
-The runtime overhead imposed by Spacetime varies considerably depending on
-the particular program being profiled.  The overhead may be as low as
-ten percent---but more usually programs should be expected to run at perhaps
-a third or quarter of their normal speed.  It is expected that this overhead
-will be reduced in future versions of the compiler.
-
-Execution speed of instrumented programs may be increased by using a compiler
-configured with the {\tt -disable-libunwind} option.  This prevents collection
-of profiling information from C stubs.
-
-Programs running with Spacetime instrumentation consume significantly more
-memory than their non-instrumented counterparts.  It is expected that this
-memory overhead will also be reduced in the future.
-
-\section{For developers}
-
-The compiler distribution provides an ``{\tt otherlibs}'' library called
-{\tt raw\_spacetime\_lib} for decoding Spacetime files.  This library
-provides facilities to read not only memory profiling information but also
-the full dynamic call graph of the profiled program which is written into
-Spacetime output files.
-
-A library package {\tt spacetime\_lib} will be provided in OPAM
-to provide an interface for decoding profiling information at a higher
-level than that provided by {\tt raw\_spacetime\_lib}.

diff --git a/manual/manual/cmds/unified-options.etex b/manual/manual/cmds/unified-options.etex
index bb543426bbccbaf794d617212e0be3fa57f8757c..0af4c2c5f4dccc6d1523a0b861454078d2c3cb88 100644 (file)
--- a/manual/manual/cmds/unified-options.etex
+++ b/manual/manual/cmds/unified-options.etex
@@ -593,7 +593,7 @@ After parsing, pipe the abstract syntax tree through the preprocessor
 \var{command}. The module "Ast_mapper", described in
 \ifouthtml
 chapter~\ref{c:parsinglib}:
-\ahref{libref/Ast\_mapper.html}{ \texttt{Ast_mapper} }
+\ahref{compilerlibref/Ast\_mapper.html}{ \texttt{Ast_mapper} }
 \else section~\ref{Ast-underscoremapper}\fi,
 implements the external interface of a preprocessor.
 

diff --git a/manual/manual/library/Makefile b/manual/manual/library/Makefile
index 453607eb24fc47f0f21831d53a35d0db8c4e97e8..6862df6b7e2306afe5f9e39c1b10d6c0c2d8b533 100644 (file)
--- a/manual/manual/library/Makefile
+++ b/manual/manual/library/Makefile
@@ -36,7 +36,7 @@ OTHERLIB_INTF = Unix.tex UnixLabels.tex Str.tex \
 
 INTF = $(CORE_INTF) $(STDLIB_INTF) $(COMPILER_LIBS_INTF) $(OTHERLIB_INTF)
 
-BLURB = core.tex builtin.tex stdlib.tex compilerlibs.tex \
+BLURB = core.tex builtin.tex stdlib-blurb.tex compilerlibs.tex \
   libunix.tex libstr.tex libnum.tex libgraph.tex \
   libthreads.tex libdynlink.tex libbigarray.tex
 

diff --git a/manual/manual/library/compilerlibs.etex b/manual/manual/library/compilerlibs.etex
index 88abbb82342de830b3508747a314d1d14029bc1d..d491937670bc52080e23c81d3d8e293d8e543b76 100644 (file)
--- a/manual/manual/library/compilerlibs.etex
+++ b/manual/manual/library/compilerlibs.etex
@@ -3,7 +3,7 @@
 
 This chapter describes the OCaml front-end, which declares the abstract
 syntax tree used by the compiler, provides a way to parse, print
-and pretty-print OCaml code, and ultimately allows to write abstract
+and pretty-print OCaml code, and ultimately allows one to write abstract
 syntax tree preprocessors invoked via the {\tt -ppx} flag (see chapters~\ref{c:camlc}
 and~\ref{c:nativecomp}) and plugins invoked via the {\tt -plugin} flag
 (see chapter~\ref{c:plugins}).

diff --git a/manual/manual/library/core.etex b/manual/manual/library/core.etex
index 6970761594d32f98881610797fd4cb268ea89f65..d3f31cd1a504344237c899ae02385c154f14b8ef 100644 (file)
--- a/manual/manual/library/core.etex
+++ b/manual/manual/library/core.etex
@@ -2,8 +2,8 @@
 
 This chapter describes the OCaml core library, which is
  composed of declarations for built-in types and exceptions, plus
-the module "Pervasives" that provides basic operations on these
- built-in types.  The "Pervasives" module is special in two
+the module "Stdlib" that provides basic operations on these
+ built-in types.  The "Stdlib" module is special in two
 ways:
 \begin{itemize}
 \item It is automatically linked with the user's object code files by
@@ -12,13 +12,13 @@ the "ocamlc" command (chapter~\ref{c:camlc}).
 \item It is automatically ``opened'' when a compilation starts, or
 when the toplevel system is launched. Hence, it is possible to use
 unqualified identifiers to refer to the functions provided by the
-"Pervasives" module, without adding a "open Pervasives" directive.
+"Stdlib" module, without adding a "open Stdlib" directive.
 \end{itemize}
 
 \section*{Conventions}
 
 The declarations of the built-in types and the components of module
-"Pervasives" are printed one by one in typewriter font, followed by a
+"Stdlib" are printed one by one in typewriter font, followed by a
 short comment.  All library modules and the components they provide are
 indexed at the end of this report.
 

diff --git a/manual/manual/library/stdlib-blurb.etex b/manual/manual/library/stdlib-blurb.etex
new file mode 100644 (file)
index 0000000..dab6ca5
--- /dev/null
+++ b/manual/manual/library/stdlib-blurb.etex
@@ -0,0 +1,217 @@
+\chapter{The standard library} \label{c:stdlib}\cutname{stdlib.html}
+
+This chapter describes the functions provided by the OCaml
+standard library. The modules from the standard library are
+automatically linked with the user's object code files by the "ocamlc"
+command. Hence, these modules can be used in standalone programs without
+having to add any ".cmo" file on the command line for the linking
+phase. Similarly, in interactive use, these globals can be used in
+toplevel phrases without having to load any ".cmo" file in memory.
+
+Unlike the core "Stdlib" module, submodules are not automatically
+``opened'' when compilation starts, or when the toplevel system is launched.
+Hence it is necessary to use qualified identifiers to refer to the functions
+provided by these modules, or to add "open" directives.
+
+\label{stdlib:top}
+
+\section*{Conventions}
+
+For easy reference, the modules are listed below in alphabetical order
+of module names.
+For each module, the declarations from its signature are printed
+one by one in typewriter font, followed by a short comment.
+All modules and the identifiers they export are indexed at the end of
+this report.
+
+\begin{latexonly}
+\section*{Overview}
+
+Here is a short listing, by theme, of the standard library modules.
+
+\subsubsection*{Data structures:}
+\begin{tabular}{lll}
+% Beware: these entries must be written in a very rigidly-defined
+% format, or the check-stdlib-modules script will complain.
+"String" & p.~\pageref{String} & string operations \\
+"Bytes" & p.~\pageref{Bytes} & operations on byte sequences\\
+"Array" & p.~\pageref{Array} & array operations \\
+"List" & p.~\pageref{List} & list operations \\
+"StdLabels" & p.~\pageref{StdLabels} & labelized versions of
+the above 4 modules \\
+"Unit" & p.~\pageref{Unit} & unit values \\
+"Bool" & p.~\pageref{Bool} & boolean values \\
+"Char" & p.~\pageref{Char} & character operations \\
+"Uchar" & p.~\pageref{Uchar} & Unicode characters \\
+"Int" & p.~\pageref{Int} & integer values \\
+"Option" & p.~\pageref{Option} & option values \\
+"Result" & p.~\pageref{Result} & result values \\
+"Hashtbl" & p.~\pageref{Hashtbl} & hash tables and hash functions \\
+"Random" & p.~\pageref{Random} & pseudo-random number generator \\
+"Set" & p.~\pageref{Set} & sets over ordered types \\
+"Map" & p.~\pageref{Map} & association tables over ordered types \\
+"MoreLabels" & p.~\pageref{MoreLabels} & labelized versions of
+"Hashtbl", "Set", and "Map" \\
+"Oo" & p.~\pageref{Oo} & useful functions on objects \\
+"Stack" & p.~\pageref{Stack} & last-in first-out stacks \\
+"Queue" & p.~\pageref{Queue} & first-in first-out queues \\
+"Buffer" & p.~\pageref{Buffer} & buffers that grow on demand \\
+"Seq" & p.~\pageref{Seq} & functional iterators \\
+"Lazy" & p.~\pageref{Lazy} & delayed evaluation \\
+"Weak" & p.~\pageref{Weak} & references that don't prevent objects
+from being garbage-collected \\
+"Ephemeron" & p.~\pageref{Ephemeron} & ephemerons and weak hash tables \\
+"Bigarray" & p.~\pageref{Bigarray} & large, multi-dimensional, numerical arrays
+\end{tabular}
+\subsubsection*{Arithmetic:}
+\begin{tabular}{lll}
+"Complex" & p.~\pageref{Complex} & Complex numbers \\
+"Float" & p.~\pageref{Float} & Floating-point numbers \\
+"Int32" & p.~\pageref{Int32} & operations on 32-bit integers \\
+"Int64" & p.~\pageref{Int64} & operations on 64-bit integers \\
+"Nativeint" & p.~\pageref{Nativeint} & operations on platform-native
+integers
+\end{tabular}
+\subsubsection{Input/output:}
+\begin{tabular}{lll}
+"Format" & p.~\pageref{Format} & pretty printing with automatic
+indentation and line breaking \\
+"Marshal" & p.~\pageref{Marshal} & marshaling of data structures \\
+"Printf" & p.~\pageref{Printf} & formatting printing functions \\
+"Scanf" & p.~\pageref{Scanf} & formatted input functions \\
+"Digest" & p.~\pageref{Digest} & MD5 message digest \\
+\end{tabular}
+\subsubsection{Parsing:}
+\begin{tabular}{lll}
+"Genlex" & p.~\pageref{Genlex} & a generic lexer over streams \\
+"Lexing" & p.~\pageref{Lexing} & the run-time library for lexers generated by "ocamllex" \\
+"Parsing" & p.~\pageref{Parsing} & the run-time library for parsers generated by "ocamlyacc" \\
+"Stream" & p.~\pageref{Stream} & basic functions over streams \\
+\end{tabular}
+\subsubsection{System interface:}
+\begin{tabular}{lll}
+"Arg" & p.~\pageref{Arg} & parsing of command line arguments \\
+"Callback" & p.~\pageref{Callback} & registering OCaml functions to
+be called from C \\
+"Filename" & p.~\pageref{Filename} & operations on file names \\
+"Gc" & p.~\pageref{Gc} & memory management control and statistics \\
+"Printexc" & p.~\pageref{Printexc} & a catch-all exception handler \\
+"Spacetime" & p.~\pageref{Spacetime} & memory profiler \\
+"Sys" & p.~\pageref{Sys} & system interface \\
+\end{tabular}
+\subsubsection{Misc:}
+\begin{tabular}{lll}
+"Fun" & p.~\pageref{Fun} & function values \\
+\end{tabular}
+\end{latexonly}
+
+\ifouthtml
+\begin{links}
+\item \ahref{libref/Arg.html}{Module \texttt{Arg}: parsing of command line arguments}
+\item \ahref{libref/Array.html}{Module \texttt{Array}: array operations}
+\item \ahref{libref/ArrayLabels.html}{Module \texttt{ArrayLabels}: array operations (with labels)}
+\item \ahref{libref/Bigarray.html}{Module \texttt{Bigarray}: large, multi-dimensional, numerical arrays}
+\item \ahref{libref/Bool.html}{Module \texttt{Bool}: boolean values}
+\item \ahref{libref/Buffer.html}{Module \texttt{Buffer}: extensible buffers}
+\item \ahref{libref/Bytes.html}{Module \texttt{Bytes}: byte sequences}
+\item \ahref{libref/BytesLabels.html}{Module \texttt{BytesLabels}: byte sequences (with labels)}
+\item \ahref{libref/Callback.html}{Module \texttt{Callback}: registering OCaml values with the C runtime}
+\item \ahref{libref/Char.html}{Module \texttt{Char}: character operations}
+\item \ahref{libref/Complex.html}{Module \texttt{Complex}: Complex numbers}
+\item \ahref{libref/Digest.html}{Module \texttt{Digest}: MD5 message digest}
+\item \ahref{libref/Ephemeron.html}{Module \texttt{Ephemeron}: Ephemerons and weak hash table}
+\item \ahref{libref/Filename.html}{Module \texttt{Filename}: operations on file names}
+\item \ahref{libref/Float.html}{Module \texttt{Float}: Floating-point numbers}
+\item \ahref{libref/Format.html}{Module \texttt{Format}: pretty printing}
+\item \ahref{libref/Fun.html}{Module \texttt{Fun}: function values}
+\item \ahref{libref/Gc.html}{Module \texttt{Gc}: memory management control and statistics; finalized values}
+\item \ahref{libref/Genlex.html}{Module \texttt{Genlex}: a generic lexical analyzer}
+\item \ahref{libref/Hashtbl.html}{Module \texttt{Hashtbl}: hash tables and hash functions}
+\item \ahref{libref/Int.html}{Module \texttt{Int}: integers}
+\item \ahref{libref/Int32.html}{Module \texttt{Int32}: 32-bit integers}
+\item \ahref{libref/Int64.html}{Module \texttt{Int64}: 64-bit integers}
+\item \ahref{libref/Lazy.html}{Module \texttt{Lazy}: deferred computations}
+\item \ahref{libref/Lexing.html}{Module \texttt{Lexing}: the run-time library for lexers generated by \texttt{ocamllex}}
+\item \ahref{libref/List.html}{Module \texttt{List}: list operations}
+\item \ahref{libref/ListLabels.html}{Module \texttt{ListLabels}: list operations (with labels)}
+\item \ahref{libref/Map.html}{Module \texttt{Map}: association tables over ordered types}
+\item \ahref{libref/Marshal.html}{Module \texttt{Marshal}: marshaling of data structures}
+\item \ahref{libref/MoreLabels.html}{Module \texttt{MoreLabels}: Include modules \texttt{Hashtbl}, \texttt{Map} and \texttt{Set} with labels}
+\item \ahref{libref/Nativeint.html}{Module \texttt{Nativeint}: processor-native integers}
+\item \ahref{libref/Oo.html}{Module \texttt{Oo}: object-oriented extension}
+\item \ahref{libref/Option.html}{Module \texttt{Option}: option values}
+\item \ahref{libref/Parsing.html}{Module \texttt{Parsing}: the run-time library for parsers generated by \texttt{ocamlyacc}}
+\item \ahref{libref/Printexc.html}{Module \texttt{Printexc}: facilities for printing exceptions}
+\item \ahref{libref/Printf.html}{Module \texttt{Printf}: formatting printing functions}
+\item \ahref{libref/Queue.html}{Module \texttt{Queue}: first-in first-out queues}
+\item \ahref{libref/Random.html}{Module \texttt{Random}: pseudo-random number generator (PRNG)}
+\item \ahref{libref/Result.html}{Module \texttt{Result}: result values}
+\item \ahref{libref/Scanf.html}{Module \texttt{Scanf}: formatted input functions}
+\item \ahref{libref/Seq.html}{Module \texttt{Seq}: functional iterators}
+\item \ahref{libref/Set.html}{Module \texttt{Set}: sets over ordered types}
+\item \ahref{libref/Spacetime.html}{Module \texttt{Spacetime}: memory profiler}
+\item \ahref{libref/Stack.html}{Module \texttt{Stack}: last-in first-out stacks}
+\item \ahref{libref/StdLabels.html}{Module \texttt{StdLabels}: Include modules \texttt{Array}, \texttt{List} and \texttt{String} with labels}
+\item \ahref{libref/Stream.html}{Module \texttt{Stream}: streams and parsers}
+\item \ahref{libref/String.html}{Module \texttt{String}: string operations}
+\item \ahref{libref/StringLabels.html}{Module \texttt{StringLabels}: string operations (with labels)}
+\item \ahref{libref/Sys.html}{Module \texttt{Sys}: system interface}
+\item \ahref{libref/Uchar.html}{Module \texttt{Uchar}: Unicode characters}
+\item \ahref{libref/Unit.html}{Module \texttt{Unit}: unit values}
+\item \ahref{libref/Weak.html}{Module \texttt{Weak}: arrays of weak pointers}
+\end{links}
+\else
+\input{Arg.tex}
+\input{Array.tex}
+\input{ArrayLabels.tex}
+\input{Bigarray.tex}
+\input{Bool.tex}
+\input{Buffer.tex}
+\input{Bytes.tex}
+\input{BytesLabels.tex}
+\input{Callback.tex}
+\input{Char.tex}
+\input{Complex.tex}
+\input{Digest.tex}
+\input{Ephemeron.tex}
+\input{Filename.tex}
+\input{Float.tex}
+\input{Format.tex}
+\input{Fun.tex}
+\input{Gc.tex}
+\input{Genlex.tex}
+\input{Hashtbl.tex}
+\input{Int.tex}
+\input{Int32.tex}
+\input{Int64.tex}
+\input{Lazy.tex}
+\input{Lexing.tex}
+\input{List.tex}
+\input{ListLabels.tex}
+\input{Map.tex}
+\input{Marshal.tex}
+\input{MoreLabels.tex}
+\input{Nativeint.tex}
+\input{Oo.tex}
+\input{Option.tex}
+\input{Parsing.tex}
+\input{Printexc.tex}
+\input{Printf.tex}
+\input{Queue.tex}
+\input{Random.tex}
+\input{Result.tex}
+\input{Scanf.tex}
+\input{Seq.tex}
+\input{Set.tex}
+\input{Spacetime.tex}
+\input{Stack.tex}
+\input{StdLabels.tex}
+\input{Stream.tex}
+\input{String.tex}
+\input{StringLabels.tex}
+\input{Sys.tex}
+\input{Uchar.tex}
+\input{Unit.tex}
+\input{Weak.tex}
+\input{Ocamloperators.tex}
+\fi

diff --git a/manual/manual/library/stdlib.etex b/manual/manual/library/stdlib.etex
deleted file mode 100644 (file)
index 7c5c41d..0000000
--- a/manual/manual/library/stdlib.etex
+++ /dev/null
@@ -1,218 +0,0 @@
-\chapter{The standard library} \label{c:stdlib}\cutname{stdlib.html}
-
-This chapter describes the functions provided by the OCaml
-standard library. The modules from the standard library are
-automatically linked with the user's object code files by the "ocamlc"
-command. Hence, these modules can be used in standalone programs without
-having to add any ".cmo" file on the command line for the linking
-phase. Similarly, in interactive use, these globals can be used in
-toplevel phrases without having to load any ".cmo" file in memory.
-
-Unlike the "Pervasives" module from the core library, the modules from the
-standard library are not automatically ``opened'' when a compilation
-starts, or when the toplevel system is launched. Hence it is necessary
-to use qualified identifiers to refer to the functions provided by these
-modules, or to add "open" directives.
-
-\label{stdlib:top}
-
-\section*{Conventions}
-
-For easy reference, the modules are listed below in alphabetical order
-of module names.
-For each module, the declarations from its signature are printed
-one by one in typewriter font, followed by a short comment.
-All modules and the identifiers they export are indexed at the end of
-this report.
-
-\begin{latexonly}
-\section*{Overview}
-
-Here is a short listing, by theme, of the standard library modules.
-
-\subsubsection*{Data structures:}
-\begin{tabular}{lll}
-% Beware: these entries must be written in a very rigidly-defined
-% format, or the check-stdlib-modules script will complain.
-"String" & p.~\pageref{String} & string operations \\
-"Bytes" & p.~\pageref{Bytes} & operations on byte sequences\\
-"Array" & p.~\pageref{Array} & array operations \\
-"List" & p.~\pageref{List} & list operations \\
-"StdLabels" & p.~\pageref{StdLabels} & labelized versions of
-the above 4 modules \\
-"Unit" & p.~\pageref{Unit} & unit values \\
-"Bool" & p.~\pageref{Bool} & boolean values \\
-"Char" & p.~\pageref{Char} & character operations \\
-"Uchar" & p.~\pageref{Uchar} & Unicode characters \\
-"Int" & p.~\pageref{Int} & integer values \\
-"Option" & p.~\pageref{Option} & option values \\
-"Result" & p.~\pageref{Result} & result values \\
-"Hashtbl" & p.~\pageref{Hashtbl} & hash tables and hash functions \\
-"Random" & p.~\pageref{Random} & pseudo-random number generator \\
-"Set" & p.~\pageref{Set} & sets over ordered types \\
-"Map" & p.~\pageref{Map} & association tables over ordered types \\
-"MoreLabels" & p.~\pageref{MoreLabels} & labelized versions of
-"Hashtbl", "Set", and "Map" \\
-"Oo" & p.~\pageref{Oo} & useful functions on objects \\
-"Stack" & p.~\pageref{Stack} & last-in first-out stacks \\
-"Queue" & p.~\pageref{Queue} & first-in first-out queues \\
-"Buffer" & p.~\pageref{Buffer} & buffers that grow on demand \\
-"Seq" & p.~\pageref{Seq} & functional iterators \\
-"Lazy" & p.~\pageref{Lazy} & delayed evaluation \\
-"Weak" & p.~\pageref{Weak} & references that don't prevent objects
-from being garbage-collected \\
-"Ephemeron" & p.~\pageref{Ephemeron} & ephemerons and weak hash tables \\
-"Bigarray" & p.~\pageref{Bigarray} & large, multi-dimensional, numerical arrays
-\end{tabular}
-\subsubsection*{Arithmetic:}
-\begin{tabular}{lll}
-"Complex" & p.~\pageref{Complex} & Complex numbers \\
-"Float" & p.~\pageref{Float} & Floating-point numbers \\
-"Int32" & p.~\pageref{Int32} & operations on 32-bit integers \\
-"Int64" & p.~\pageref{Int64} & operations on 64-bit integers \\
-"Nativeint" & p.~\pageref{Nativeint} & operations on platform-native
-integers
-\end{tabular}
-\subsubsection{Input/output:}
-\begin{tabular}{lll}
-"Format" & p.~\pageref{Format} & pretty printing with automatic
-indentation and line breaking \\
-"Marshal" & p.~\pageref{Marshal} & marshaling of data structures \\
-"Printf" & p.~\pageref{Printf} & formatting printing functions \\
-"Scanf" & p.~\pageref{Scanf} & formatted input functions \\
-"Digest" & p.~\pageref{Digest} & MD5 message digest \\
-\end{tabular}
-\subsubsection{Parsing:}
-\begin{tabular}{lll}
-"Genlex" & p.~\pageref{Genlex} & a generic lexer over streams \\
-"Lexing" & p.~\pageref{Lexing} & the run-time library for lexers generated by "ocamllex" \\
-"Parsing" & p.~\pageref{Parsing} & the run-time library for parsers generated by "ocamlyacc" \\
-"Stream" & p.~\pageref{Stream} & basic functions over streams \\
-\end{tabular}
-\subsubsection{System interface:}
-\begin{tabular}{lll}
-"Arg" & p.~\pageref{Arg} & parsing of command line arguments \\
-"Callback" & p.~\pageref{Callback} & registering OCaml functions to
-be called from C \\
-"Filename" & p.~\pageref{Filename} & operations on file names \\
-"Gc" & p.~\pageref{Gc} & memory management control and statistics \\
-"Printexc" & p.~\pageref{Printexc} & a catch-all exception handler \\
-"Spacetime" & p.~\pageref{Spacetime} & memory profiler \\
-"Sys" & p.~\pageref{Sys} & system interface \\
-\end{tabular}
-\subsubsection{Misc:}
-\begin{tabular}{lll}
-"Fun" & p.~\pageref{Fun} & function values \\
-\end{tabular}
-\end{latexonly}
-
-\ifouthtml
-\begin{links}
-\item \ahref{libref/Arg.html}{Module \texttt{Arg}: parsing of command line arguments}
-\item \ahref{libref/Array.html}{Module \texttt{Array}: array operations}
-\item \ahref{libref/ArrayLabels.html}{Module \texttt{ArrayLabels}: array operations (with labels)}
-\item \ahref{libref/Bigarray.html}{Module \texttt{Bigarray}: large, multi-dimensional, numerical arrays}
-\item \ahref{libref/Bool.html}{Module \texttt{Bool}: boolean values}
-\item \ahref{libref/Buffer.html}{Module \texttt{Buffer}: extensible buffers}
-\item \ahref{libref/Bytes.html}{Module \texttt{Bytes}: byte sequences}
-\item \ahref{libref/BytesLabels.html}{Module \texttt{BytesLabels}: byte sequences (with labels)}
-\item \ahref{libref/Callback.html}{Module \texttt{Callback}: registering OCaml values with the C runtime}
-\item \ahref{libref/Char.html}{Module \texttt{Char}: character operations}
-\item \ahref{libref/Complex.html}{Module \texttt{Complex}: Complex numbers}
-\item \ahref{libref/Digest.html}{Module \texttt{Digest}: MD5 message digest}
-\item \ahref{libref/Ephemeron.html}{Module \texttt{Ephemeron}: Ephemerons and weak hash table}
-\item \ahref{libref/Filename.html}{Module \texttt{Filename}: operations on file names}
-\item \ahref{libref/Float.html}{Module \texttt{Float}: Floating-point numbers}
-\item \ahref{libref/Format.html}{Module \texttt{Format}: pretty printing}
-\item \ahref{libref/Fun.html}{Module \texttt{Fun}: function values}
-\item \ahref{libref/Gc.html}{Module \texttt{Gc}: memory management control and statistics; finalized values}
-\item \ahref{libref/Genlex.html}{Module \texttt{Genlex}: a generic lexical analyzer}
-\item \ahref{libref/Hashtbl.html}{Module \texttt{Hashtbl}: hash tables and hash functions}
-\item \ahref{libref/Int}{Module \texttt{Int}: integers}
-\item \ahref{libref/Int32.html}{Module \texttt{Int32}: 32-bit integers}
-\item \ahref{libref/Int64.html}{Module \texttt{Int64}: 64-bit integers}
-\item \ahref{libref/Lazy.html}{Module \texttt{Lazy}: deferred computations}
-\item \ahref{libref/Lexing.html}{Module \texttt{Lexing}: the run-time library for lexers generated by \texttt{ocamllex}}
-\item \ahref{libref/List.html}{Module \texttt{List}: list operations}
-\item \ahref{libref/ListLabels.html}{Module \texttt{ListLabels}: list operations (with labels)}
-\item \ahref{libref/Map.html}{Module \texttt{Map}: association tables over ordered types}
-\item \ahref{libref/Marshal.html}{Module \texttt{Marshal}: marshaling of data structures}
-\item \ahref{libref/MoreLabels.html}{Module \texttt{MoreLabels}: Include modules \texttt{Hashtbl}, \texttt{Map} and \texttt{Set} with labels}
-\item \ahref{libref/Nativeint.html}{Module \texttt{Nativeint}: processor-native integers}
-\item \ahref{libref/Oo.html}{Module \texttt{Oo}: object-oriented extension}
-\item \ahref{libref/Option.html}{Module \texttt{Option}: option values}
-\item \ahref{libref/Parsing.html}{Module \texttt{Parsing}: the run-time library for parsers generated by \texttt{ocamlyacc}}
-\item \ahref{libref/Printexc.html}{Module \texttt{Printexc}: facilities for printing exceptions}
-\item \ahref{libref/Printf.html}{Module \texttt{Printf}: formatting printing functions}
-\item \ahref{libref/Queue.html}{Module \texttt{Queue}: first-in first-out queues}
-\item \ahref{libref/Random.html}{Module \texttt{Random}: pseudo-random number generator (PRNG)}
-\item \ahref{libref/Result.html}{Module \texttt{Result}: result values}
-\item \ahref{libref/Scanf.html}{Module \texttt{Scanf}: formatted input functions}
-\item \ahref{libref/Seq.html}{Module \texttt{Seq}: functional iterators}
-\item \ahref{libref/Set.html}{Module \texttt{Set}: sets over ordered types}
-\item \ahref{libref/Spacetime.html}{Module \texttt{Spacetime}: memory profiler}
-\item \ahref{libref/Stack.html}{Module \texttt{Stack}: last-in first-out stacks}
-\item \ahref{libref/StdLabels.html}{Module \texttt{StdLabels}: Include modules \texttt{Array}, \texttt{List} and \texttt{String} with labels}
-\item \ahref{libref/Stream.html}{Module \texttt{Stream}: streams and parsers}
-\item \ahref{libref/String.html}{Module \texttt{String}: string operations}
-\item \ahref{libref/StringLabels.html}{Module \texttt{StringLabels}: string operations (with labels)}
-\item \ahref{libref/Sys.html}{Module \texttt{Sys}: system interface}
-\item \ahref{libref/Uchar.html}{Module \texttt{Uchar}: Unicode characters}
-\item \ahref{libref/Unit.html}{Module \texttt{Unit}: unit values}
-\item \ahref{libref/Weak.html}{Module \texttt{Weak}: arrays of weak pointers}
-\end{links}
-\else
-\input{Arg.tex}
-\input{Array.tex}
-\input{ArrayLabels.tex}
-\input{Bigarray.tex}
-\input{Bool.tex}
-\input{Buffer.tex}
-\input{Bytes.tex}
-\input{BytesLabels.tex}
-\input{Callback.tex}
-\input{Char.tex}
-\input{Complex.tex}
-\input{Digest.tex}
-\input{Ephemeron.tex}
-\input{Filename.tex}
-\input{Float.tex}
-\input{Format.tex}
-\input{Fun.tex}
-\input{Gc.tex}
-\input{Genlex.tex}
-\input{Hashtbl.tex}
-\input{Int.tex}
-\input{Int32.tex}
-\input{Int64.tex}
-\input{Lazy.tex}
-\input{Lexing.tex}
-\input{List.tex}
-\input{ListLabels.tex}
-\input{Map.tex}
-\input{Marshal.tex}
-\input{MoreLabels.tex}
-\input{Nativeint.tex}
-\input{Oo.tex}
-\input{Option.tex}
-\input{Parsing.tex}
-\input{Printexc.tex}
-\input{Printf.tex}
-\input{Queue.tex}
-\input{Random.tex}
-\input{Result.tex}
-\input{Scanf.tex}
-\input{Seq.tex}
-\input{Set.tex}
-\input{Spacetime.tex}
-\input{Stack.tex}
-\input{StdLabels.tex}
-\input{Stream.tex}
-\input{String.tex}
-\input{StringLabels.tex}
-\input{Sys.tex}
-\input{Uchar.tex}
-\input{Unit.tex}
-\input{Weak.tex}
-\input{Ocamloperators.tex}
-\fi

diff --git a/manual/manual/refman/expr.etex b/manual/manual/refman/expr.etex
index faf5023181dc89a042a7ad89838b09e321e0c4d4..30b7b05d245eedf1f8c132aa98571fc0d92f7b9e 100644 (file)
--- a/manual/manual/refman/expr.etex
+++ b/manual/manual/refman/expr.etex
@@ -703,7 +703,7 @@ interpreted as the application @'(' infix-symbol ')' expr_1 expr_2@.
 
 The table below lists the symbols defined in the initial environment
 and their initial meaning. (See the description of the core
-library module "Pervasives" in chapter~\ref{c:corelib} for more
+library module "Stdlib" in chapter~\ref{c:corelib} for more
 details). Their meaning may be changed at any time using
 @"let" "(" infix-op ")" name_1 name_2 "=" \ldots@
 

diff --git a/manual/manual/tutorials/lablexamples.etex b/manual/manual/tutorials/lablexamples.etex
index ef792715626398820cf51be8b838341c18dcb9a4..e306b88edbf3c284237dba21e52aeb848beab88d 100644 (file)
--- a/manual/manual/tutorials/lablexamples.etex
+++ b/manual/manual/tutorials/lablexamples.etex
@@ -292,7 +292,7 @@ libraries.
 \entree{"src:"}{the source of an operation}
 \entree{"dst:"}{the destination of an operation}
 \entree{"init:"}{the initial value for an iterator}
-\entree{"cmp:"}{a comparison function, {\it e.g.} "Pervasives.compare"}
+\entree{"cmp:"}{a comparison function, {\it e.g.} "Stdlib.compare"}
 \entree{"mode:"}{an operation mode or a flag list}
 \end{tableau}
 

diff --git a/manual/tests/README.md b/manual/tests/README.md
index 31d2ab40fdc06926ca4a215d64362d64ee5c9c7b..2f580d475379b745a77607d51af217588b0ba0d9 100644 (file)
--- a/manual/tests/README.md
+++ b/manual/tests/README.md
@@ -5,4 +5,5 @@ the rest of the compiler sources:
   compiler sources are still accurate.
 
 - `check-stdlib-modules` checks that all stdlib modules are linked from the
-  main entry of the stdlib in the manual: `manual/manual/library/stdlib.etex`
+  main entry of the stdlib in the manual:
+  `manual/manual/library/stdlib-blurb.etex`

diff --git a/manual/tests/check-stdlib-modules b/manual/tests/check-stdlib-modules
index 6e9835236608ad1d2f312d27a9b17614655afa17..ee8cc3ddfbed79f9d540e609050f2a05b520a3e4 100755 (executable)
--- a/manual/tests/check-stdlib-modules
+++ b/manual/tests/check-stdlib-modules
@@ -12,8 +12,8 @@ for i in `cat $TMPDIR/stdlib-$$-modules`; do
   case $i in
     Stdlib | Camlinternal* | *Labels | Obj | Pervasives) continue;;
   esac
-  grep -q -e '"'$i'" & p\.~\\pageref{'$i'} &' $1/manual/manual/library/stdlib.etex || {
-    echo "Module $i is missing from stdlib.etex." >&2
+  grep -q -e '"'$i'" & p\.~\\pageref{'$i'} &' $1/manual/manual/library/stdlib-blurb.etex || {
+    echo "Module $i is missing from stdlib-blurb.etex." >&2
     exitcode=2
   }
 done

diff --git a/middle_end/inlining_transforms.ml b/middle_end/inlining_transforms.ml
index b08e62bb0ae22f9f61f6afb40f800a21be78d07a..c46a6cbe6ce972f56219239df652ba4c227b5d36 100755 (executable)
--- a/middle_end/inlining_transforms.ml
+++ b/middle_end/inlining_transforms.ml
@@ -118,7 +118,7 @@ let inline_by_copying_function_body ~env ~r
     && ((not default_inline) || (not default_specialise)) then
       (* When the function inlined function is a stub, the annotation
          is reported to the function applications inside the stub.
-         This allows to report the annotation to the application the
+         This allows reporting the annotation to the application the
          original programmer really intended: the stub is not visible
          in the source. *)
       set_inline_attribute_on_all_apply body

diff --git a/ocaml-variants.opam b/ocaml-variants.opam
index 51b6e7c1dcb501c9349c82f86ca713b387c8bc3b..96b04ba38bd8e48562ba0abfb3fe7bea4d570942 100644 (file)
--- a/ocaml-variants.opam
+++ b/ocaml-variants.opam
@@ -1,8 +1,8 @@
 opam-version: "2.0"
-version: "4.08.0"
-synopsis: "OCaml release 4.08.0"
+version: "4.08.1"
+synopsis: "OCaml release 4.08.1"
 depends: [
-  "ocaml" {= "4.08.0" & post}
+  "ocaml" {= "4.08.1" & post}
   "base-unix" {post}
   "base-bigarray" {post}
   "base-threads" {post}

diff --git a/ocamldoc/odoc_sig.ml b/ocamldoc/odoc_sig.ml
index fb2eac671210bd35731e3a02a59c00760d55e7ac..e413c11a665f9b53e13a4d1247b6e001456595d1 100644 (file)
--- a/ocamldoc/odoc_sig.ml
+++ b/ocamldoc/odoc_sig.ml
@@ -1740,11 +1740,11 @@ module Analyser =
             )
           else
             (
-             raise (Failure "Parsetree.Pcty_arrow (parse_label, _, pclass_type), labels differents")
+             raise (Failure "Parsetree.Pcty_arrow (parse_label, _, pclass_type), different labels")
             )
 
       | _ ->
-          raise (Failure "analyse_class_kind pas de correspondance dans le match")
+          raise (Failure "analyse_class_kind: match failure")
 
     (** Analyse of a Parsetree.class_type and a Types.class_type to return a class_type_kind.*)
     and analyse_class_type_kind env current_class_name last_pos parse_class_type sig_class_type =
@@ -1799,7 +1799,7 @@ module Analyser =
            ([], k)
 *)
       | _ ->
-          raise (Failure "analyse_class_type_kind pas de correspondance dans le match")
+          raise (Failure "analyse_class_type_kind: match failure")
 
     let analyse_signature source_file input_file
         (ast : Parsetree.signature) (signat : Types.signature) =

diff --git a/ocamltest/.depend b/ocamltest/.depend
index e730c76aefc1ff36a8373d0a9662c20703d29943..278e3e86761630263422ad6fa7c0790974511747 100644 (file)
--- a/ocamltest/.depend
+++ b/ocamltest/.depend
@@ -1,21 +1,22 @@
 run_unix.$(O): run_unix.c run.h ../runtime/caml/misc.h \
-  ../runtime/caml/config.h ../runtime/caml/m.h ../runtime/caml/s.h \
-  run_common.h
+ ../runtime/caml/config.h ../runtime/caml/m.h ../runtime/caml/s.h \
+ run_common.h
 run_stubs.$(O): run_stubs.c run.h ../runtime/caml/misc.h \
-  ../runtime/caml/config.h ../runtime/caml/m.h ../runtime/caml/s.h \
-  ../runtime/caml/mlvalues.h ../runtime/caml/memory.h \
-  ../runtime/caml/gc.h ../runtime/caml/major_gc.h \
-  ../runtime/caml/freelist.h ../runtime/caml/minor_gc.h \
-  ../runtime/caml/address_class.h ../runtime/caml/io.h \
-  ../runtime/caml/osdeps.h
+ ../runtime/caml/config.h ../runtime/caml/m.h ../runtime/caml/s.h \
+ ../runtime/caml/mlvalues.h ../runtime/caml/misc.h \
+ ../runtime/caml/memory.h ../runtime/caml/gc.h ../runtime/caml/mlvalues.h \
+ ../runtime/caml/major_gc.h ../runtime/caml/freelist.h \
+ ../runtime/caml/minor_gc.h ../runtime/caml/address_class.h \
+ ../runtime/caml/io.h ../runtime/caml/osdeps.h ../runtime/caml/memory.h
 ocamltest_stdlib_stubs.$(O): ocamltest_stdlib_stubs.c \
-  ../runtime/caml/config.h ../runtime/caml/m.h ../runtime/caml/s.h \
-  ../runtime/caml/mlvalues.h ../runtime/caml/misc.h \
-  ../runtime/caml/memory.h ../runtime/caml/gc.h \
-  ../runtime/caml/major_gc.h ../runtime/caml/freelist.h \
-  ../runtime/caml/minor_gc.h ../runtime/caml/address_class.h \
-  ../runtime/caml/alloc.h ../runtime/caml/signals.h \
-  ../runtime/caml/osdeps.h
+ ../runtime/caml/config.h ../runtime/caml/m.h ../runtime/caml/s.h \
+ ../runtime/caml/mlvalues.h ../runtime/caml/config.h \
+ ../runtime/caml/misc.h ../runtime/caml/memory.h ../runtime/caml/gc.h \
+ ../runtime/caml/mlvalues.h ../runtime/caml/major_gc.h \
+ ../runtime/caml/freelist.h ../runtime/caml/minor_gc.h \
+ ../runtime/caml/address_class.h ../runtime/caml/alloc.h \
+ ../runtime/caml/signals.h ../runtime/caml/osdeps.h \
+ ../runtime/caml/memory.h
 actions.cmo : \
     result.cmi \
     environments.cmi \

diff --git a/otherlibs/dynlink/dynlink.ml b/otherlibs/dynlink/dynlink.ml
index 09289db5416a79d177a53d950d381f3831b33a8a..35bd88e2e2cfc4adbd1038bb68cc5af6edf43797 100644 (file)
--- a/otherlibs/dynlink/dynlink.ml
+++ b/otherlibs/dynlink/dynlink.ml
@@ -39,7 +39,11 @@ module Bytecode = struct
         @ Symtable.required_globals t.cu_reloc
       in
       let required =
-        List.filter (fun id -> not (Ident.is_predef id)) required
+        List.filter
+          (fun id ->
+             not (Ident.is_predef id)
+             && not (String.contains (Ident.name id) '.'))
+          required
       in
       List.map
         (fun ident -> Ident.name ident, None)

diff --git a/otherlibs/graph/.depend b/otherlibs/graph/.depend
index cb4dfd44a5961fce68b0845b59e31403bd10ce6c..1ac60883bb1f3dfa6e96cee3136f74e96b04f847 100644 (file)
--- a/otherlibs/graph/.depend
+++ b/otherlibs/graph/.depend
@@ -1,3 +1,60 @@
+color.o: color.c libgraph.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/misc.h
+draw.o: draw.c libgraph.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/misc.h ../../runtime/caml/alloc.h \
+ ../../runtime/caml/mlvalues.h
+dump_img.o: dump_img.c libgraph.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/misc.h image.h ../../runtime/caml/alloc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/memory.h
+events.o: events.c libgraph.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/misc.h ../../runtime/caml/alloc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/signals.h
+fill.o: fill.c libgraph.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/misc.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/mlvalues.h
+image.o: image.c libgraph.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/misc.h image.h ../../runtime/caml/alloc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/custom.h
+make_img.o: make_img.c libgraph.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/misc.h image.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/mlvalues.h
+open.o: open.c libgraph.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/misc.h ../../runtime/caml/alloc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/callback.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/memory.h
+point_col.o: point_col.c libgraph.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/misc.h
+sound.o: sound.c libgraph.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/misc.h
+subwindow.o: subwindow.c libgraph.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/misc.h
+text.o: text.c libgraph.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/misc.h ../../runtime/caml/alloc.h \
+ ../../runtime/caml/mlvalues.h
 graphics.cmo : \
     graphics.cmi
 graphics.cmx : \

diff --git a/otherlibs/raw_spacetime_lib/.depend b/otherlibs/raw_spacetime_lib/.depend
index 381a50d24cd42be9758c1d0509da73e3e997368c..d725a30936e2fe8af314ecd0647d003dcded42e3 100644 (file)
--- a/otherlibs/raw_spacetime_lib/.depend
+++ b/otherlibs/raw_spacetime_lib/.depend
@@ -1,14 +1,18 @@
 spacetime_offline.$(O): spacetime_offline.c ../../runtime/caml/alloc.h \
-  ../../runtime/caml/misc.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/mlvalues.h ../../runtime/caml/fail.h \
-  ../../runtime/caml/gc.h ../../runtime/caml/intext.h \
-  ../../runtime/caml/io.h ../../runtime/caml/major_gc.h \
-  ../../runtime/caml/freelist.h ../../runtime/caml/memory.h \
-  ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
-  ../../runtime/caml/roots.h ../../runtime/caml/signals.h \
-  ../../runtime/caml/stack.h ../../runtime/caml/sys.h \
-  ../../runtime/caml/spacetime.h
+ ../../runtime/caml/misc.h ../../runtime/caml/config.h \
+ ../../runtime/caml/m.h ../../runtime/caml/s.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/intext.h ../../runtime/caml/io.h \
+ ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/major_gc.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/misc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/roots.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/signals.h ../../runtime/caml/stack.h \
+ ../../runtime/caml/sys.h ../../runtime/caml/spacetime.h \
+ ../../runtime/caml/stack.h ../../runtime/caml/s.h
 raw_spacetime_lib.cmo : \
     raw_spacetime_lib.cmi
 raw_spacetime_lib.cmx : \

diff --git a/otherlibs/str/.depend b/otherlibs/str/.depend
index 4a2d288d137d53006c0cac2dd78c7ba3b0537493..9a611166db23d4d04c69e7c36f02720129dad48b 100644 (file)
--- a/otherlibs/str/.depend
+++ b/otherlibs/str/.depend
@@ -1,8 +1,8 @@
 strstubs.$(O): strstubs.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/memory.h \
-  ../../runtime/caml/fail.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/fail.h
 str.cmo : \
     str.cmi
 str.cmx : \

diff --git a/otherlibs/systhreads/.depend b/otherlibs/systhreads/.depend
index a8016531ab3a90de8ca6a7b9649663237530d477..2c64f077db240aa02040291c25cdae6d861c97c3 100644 (file)
--- a/otherlibs/systhreads/.depend
+++ b/otherlibs/systhreads/.depend
@@ -1,29 +1,31 @@
 st_stubs_b.$(O): st_stubs.c ../../runtime/caml/alloc.h \
-  ../../runtime/caml/misc.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/mlvalues.h ../../runtime/caml/backtrace.h \
-  ../../runtime/caml/exec.h ../../runtime/caml/callback.h \
-  ../../runtime/caml/custom.h ../../runtime/caml/fail.h \
-  ../../runtime/caml/io.h ../../runtime/caml/memory.h \
-  ../../runtime/caml/gc.h ../../runtime/caml/major_gc.h \
-  ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
-  ../../runtime/caml/address_class.h ../../runtime/caml/printexc.h \
-  ../../runtime/caml/roots.h ../../runtime/caml/signals.h \
-  ../../runtime/caml/stacks.h ../../runtime/caml/sys.h threads.h \
-  st_posix.h
+ ../../runtime/caml/misc.h ../../runtime/caml/config.h \
+ ../../runtime/caml/m.h ../../runtime/caml/s.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/backtrace.h \
+ ../../runtime/caml/exec.h ../../runtime/caml/callback.h \
+ ../../runtime/caml/custom.h ../../runtime/caml/fail.h \
+ ../../runtime/caml/io.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/gc.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/printexc.h \
+ ../../runtime/caml/roots.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/signals.h ../../runtime/caml/stacks.h \
+ ../../runtime/caml/sys.h threads.h
 st_stubs_n.$(O): st_stubs.c ../../runtime/caml/alloc.h \
-  ../../runtime/caml/misc.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/mlvalues.h ../../runtime/caml/backtrace.h \
-  ../../runtime/caml/exec.h ../../runtime/caml/callback.h \
-  ../../runtime/caml/custom.h ../../runtime/caml/fail.h \
-  ../../runtime/caml/io.h ../../runtime/caml/memory.h \
-  ../../runtime/caml/gc.h ../../runtime/caml/major_gc.h \
-  ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
-  ../../runtime/caml/address_class.h ../../runtime/caml/printexc.h \
-  ../../runtime/caml/roots.h ../../runtime/caml/signals.h \
-  ../../runtime/caml/stack.h ../../runtime/caml/sys.h threads.h \
-  st_posix.h
+ ../../runtime/caml/misc.h ../../runtime/caml/config.h \
+ ../../runtime/caml/m.h ../../runtime/caml/s.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/backtrace.h \
+ ../../runtime/caml/exec.h ../../runtime/caml/callback.h \
+ ../../runtime/caml/custom.h ../../runtime/caml/fail.h \
+ ../../runtime/caml/io.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/gc.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/printexc.h \
+ ../../runtime/caml/roots.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/signals.h ../../runtime/caml/stack.h \
+ ../../runtime/caml/sys.h threads.h
 condition.cmo : \
     mutex.cmi \
     condition.cmi

diff --git a/otherlibs/systhreads/event.mli b/otherlibs/systhreads/event.mli
index 83dbe9a1744e418e8817ad34f85eefa8d8a077ce..fd452652c691511e423397297d7c182e71cfd2ab 100644 (file)
--- a/otherlibs/systhreads/event.mli
+++ b/otherlibs/systhreads/event.mli
@@ -59,8 +59,8 @@ val wrap_abort : 'a event -> (unit -> unit) -> 'a event
 
 val guard : (unit -> 'a event) -> 'a event
 (** [guard fn] returns the event that, when synchronized, computes
-   [fn()] and behaves as the resulting event. This allows to
-   compute events with side-effects at the time of the synchronization
+   [fn()] and behaves as the resulting event. This enables
+   computing events with side-effects at the time of the synchronization
    operation. *)
 
 val sync : 'a event -> 'a

diff --git a/otherlibs/threads/.depend b/otherlibs/threads/.depend
index e6ce803b756fa8e5962a3ec6eb64acee8b80f5c5..8c74f88d92e86199d06e6ce37ccd9387f8ef4522 100644 (file)
--- a/otherlibs/threads/.depend
+++ b/otherlibs/threads/.depend
@@ -1,15 +1,17 @@
 scheduler.o: scheduler.c ../../runtime/caml/alloc.h \
-  ../../runtime/caml/misc.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/mlvalues.h ../../runtime/caml/backtrace.h \
-  ../../runtime/caml/exec.h ../../runtime/caml/callback.h \
-  ../../runtime/caml/fail.h ../../runtime/caml/io.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
-  ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
-  ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
-  ../../runtime/caml/printexc.h ../../runtime/caml/roots.h \
-  ../../runtime/caml/signals.h ../../runtime/caml/stacks.h \
-  ../../runtime/caml/sys.h
+ ../../runtime/caml/misc.h ../../runtime/caml/config.h \
+ ../../runtime/caml/m.h ../../runtime/caml/s.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/backtrace.h \
+ ../../runtime/caml/exec.h ../../runtime/caml/callback.h \
+ ../../runtime/caml/config.h ../../runtime/caml/fail.h \
+ ../../runtime/caml/io.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/gc.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/printexc.h \
+ ../../runtime/caml/roots.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/signals.h ../../runtime/caml/stacks.h \
+ ../../runtime/caml/sys.h
 condition.cmo : \
     thread.cmi \
     mutex.cmi \

diff --git a/otherlibs/unix/.depend b/otherlibs/unix/.depend
index 80a9f4a8dd07a656a544334e980118eebaf8b2b6..1030d945bbf1f3186a2b220bf85f8ea487a98df1 100644 (file)
--- a/otherlibs/unix/.depend
+++ b/otherlibs/unix/.depend
@@ -1,458 +1,511 @@
 accept.o: accept.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/fail.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/signals.h unixsupport.h \
-  socketaddr.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/signals.h unixsupport.h socketaddr.h \
+ ../../runtime/caml/misc.h
 access.o: access.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/memory.h \
-  ../../runtime/caml/signals.h ../../runtime/caml/osdeps.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/signals.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h unixsupport.h
 addrofstr.o: addrofstr.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/fail.h unixsupport.h \
-  socketaddr.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h unixsupport.h socketaddr.h \
+ ../../runtime/caml/misc.h
 alarm.o: alarm.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
 bind.o: bind.c ../../runtime/caml/fail.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h unixsupport.h \
-  socketaddr.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/mlvalues.h unixsupport.h socketaddr.h \
+ ../../runtime/caml/misc.h
 channels.o: channels.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/io.h ../../runtime/caml/signals.h unixsupport.h \
-  socketaddr.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h ../../runtime/caml/io.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/signals.h unixsupport.h \
+ socketaddr.h ../../runtime/caml/misc.h
 chdir.o: chdir.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
-  ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
-  ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
-  ../../runtime/caml/signals.h ../../runtime/caml/osdeps.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/signals.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h unixsupport.h
 chmod.o: chmod.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
-  ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
-  ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
-  ../../runtime/caml/signals.h ../../runtime/caml/osdeps.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/signals.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h unixsupport.h
 chown.o: chown.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/signals.h unixsupport.h
 chroot.o: chroot.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/signals.h unixsupport.h
 close.o: close.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/signals.h ../../runtime/caml/mlvalues.h unixsupport.h
 closedir.o: closedir.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/signals.h unixsupport.h
 connect.o: connect.c ../../runtime/caml/fail.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/signals.h unixsupport.h socketaddr.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/signals.h unixsupport.h \
+ socketaddr.h ../../runtime/caml/misc.h
 cst2constr.o: cst2constr.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/fail.h cst2constr.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/mlvalues.h cst2constr.h
 cstringv.o: cstringv.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
-  ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
-  ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
-  ../../runtime/caml/osdeps.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/osdeps.h \
+ ../../runtime/caml/memory.h unixsupport.h
 dup.o: dup.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/misc.h unixsupport.h
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ unixsupport.h
 dup2.o: dup2.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/misc.h unixsupport.h
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ unixsupport.h
 envir.o: envir.c ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/misc.h ../../runtime/caml/alloc.h
+ ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h
 errmsg.o: errmsg.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h
 execv.o: execv.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
-  ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
-  ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
-  ../../runtime/caml/osdeps.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/osdeps.h \
+ ../../runtime/caml/memory.h unixsupport.h
 execve.o: execve.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
-  ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
-  ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
-  ../../runtime/caml/osdeps.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/osdeps.h \
+ ../../runtime/caml/memory.h unixsupport.h
 execvp.o: execvp.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/osdeps.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h unixsupport.h
 exit.o: exit.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/misc.h unixsupport.h
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ unixsupport.h
 fchmod.o: fchmod.c ../../runtime/caml/fail.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/signals.h unixsupport.h
 fchown.o: fchown.c ../../runtime/caml/fail.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/signals.h unixsupport.h
 fcntl.o: fcntl.c ../../runtime/caml/fail.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/mlvalues.h unixsupport.h
 fork.o: fork.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/misc.h ../../runtime/caml/debugger.h unixsupport.h
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/debugger.h ../../runtime/caml/mlvalues.h \
+ unixsupport.h
 fsync.o: fsync.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/signals.h ../../runtime/caml/mlvalues.h unixsupport.h
 ftruncate.o: ftruncate.c ../../runtime/caml/fail.h \
-  ../../runtime/caml/misc.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/mlvalues.h ../../runtime/caml/io.h \
-  ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/misc.h ../../runtime/caml/config.h \
+ ../../runtime/caml/m.h ../../runtime/caml/s.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/io.h ../../runtime/caml/signals.h unixsupport.h
 getaddrinfo.o: getaddrinfo.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/fail.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/signals.h unixsupport.h \
-  cst2constr.h socketaddr.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/misc.h ../../runtime/caml/signals.h unixsupport.h \
+ cst2constr.h socketaddr.h
 getcwd.o: getcwd.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/fail.h \
-  ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h \
-  ../../runtime/caml/gc.h ../../runtime/caml/major_gc.h \
-  ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
-  ../../runtime/caml/address_class.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/osdeps.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
+ ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
+ unixsupport.h
 getegid.o: getegid.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
 geteuid.o: geteuid.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
 getgid.o: getgid.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
 getgr.o: getgr.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/fail.h ../../runtime/caml/alloc.h \
-  ../../runtime/caml/memory.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/memory.h unixsupport.h
 getgroups.o: getgroups.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/fail.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h unixsupport.h
 gethost.o: gethost.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/fail.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/signals.h unixsupport.h \
-  socketaddr.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/signals.h unixsupport.h socketaddr.h \
+ ../../runtime/caml/misc.h
 gethostname.o: gethostname.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/fail.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h unixsupport.h
 getlogin.o: getlogin.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h unixsupport.h
 getnameinfo.o: getnameinfo.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/fail.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/signals.h unixsupport.h \
-  socketaddr.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/signals.h unixsupport.h socketaddr.h \
+ ../../runtime/caml/misc.h
 getpeername.o: getpeername.c ../../runtime/caml/fail.h \
-  ../../runtime/caml/misc.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/mlvalues.h unixsupport.h socketaddr.h
+ ../../runtime/caml/misc.h ../../runtime/caml/config.h \
+ ../../runtime/caml/m.h ../../runtime/caml/s.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/mlvalues.h \
+ unixsupport.h socketaddr.h ../../runtime/caml/misc.h
 getpid.o: getpid.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
 getppid.o: getppid.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
 getproto.o: getproto.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/fail.h \
-  ../../runtime/caml/memory.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/memory.h unixsupport.h
 getpw.o: getpw.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/memory.h \
-  ../../runtime/caml/fail.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/fail.h unixsupport.h
 getserv.o: getserv.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/fail.h \
-  ../../runtime/caml/memory.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/memory.h unixsupport.h
 getsockname.o: getsockname.c ../../runtime/caml/fail.h \
-  ../../runtime/caml/misc.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/mlvalues.h unixsupport.h socketaddr.h
+ ../../runtime/caml/misc.h ../../runtime/caml/config.h \
+ ../../runtime/caml/m.h ../../runtime/caml/s.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/mlvalues.h \
+ unixsupport.h socketaddr.h ../../runtime/caml/misc.h
 gettimeofday.o: gettimeofday.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/fail.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h unixsupport.h
 getuid.o: getuid.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
 gmtime.o: gmtime.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/fail.h \
-  ../../runtime/caml/memory.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/memory.h unixsupport.h
 initgroups.o: initgroups.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/fail.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h unixsupport.h
 isatty.o: isatty.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
 itimer.o: itimer.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/fail.h \
-  ../../runtime/caml/memory.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/memory.h unixsupport.h
 kill.o: kill.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/misc.h ../../runtime/caml/fail.h unixsupport.h \
-  ../../runtime/caml/signals.h
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/mlvalues.h unixsupport.h \
+ ../../runtime/caml/signals.h
 link.o: link.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/misc.h ../../runtime/caml/memory.h \
-  ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/signals.h unixsupport.h
 listen.o: listen.c ../../runtime/caml/fail.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/mlvalues.h unixsupport.h
 lockf.o: lockf.c ../../runtime/caml/fail.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/signals.h unixsupport.h
 lseek.o: lseek.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/io.h \
-  ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/io.h ../../runtime/caml/signals.h unixsupport.h
 mkdir.o: mkdir.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/signals.h unixsupport.h
 mkfifo.o: mkfifo.c ../../runtime/caml/fail.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/signals.h unixsupport.h
 mmap.o: mmap.c ../../runtime/caml/bigarray.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/mlvalues.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/fail.h ../../runtime/caml/io.h \
-  ../../runtime/caml/signals.h ../../runtime/caml/sys.h unixsupport.h
+ ../../runtime/caml/m.h ../../runtime/caml/s.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/io.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/signals.h \
+ ../../runtime/caml/sys.h unixsupport.h
 mmap_ba.o: mmap_ba.c ../../runtime/caml/alloc.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/bigarray.h ../../runtime/caml/custom.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
-  ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
-  ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/bigarray.h ../../runtime/caml/custom.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
+ ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
+ ../../runtime/caml/misc.h
 nice.o: nice.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/misc.h unixsupport.h
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ unixsupport.h
 open.o: open.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/misc.h ../../runtime/caml/alloc.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/signals.h unixsupport.h
 opendir.o: opendir.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/alloc.h \
-  ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/signals.h unixsupport.h
 pipe.o: pipe.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/misc.h ../../runtime/caml/alloc.h unixsupport.h
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h unixsupport.h
 putenv.o: putenv.c ../../runtime/caml/fail.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
-  ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
-  ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
-  ../../runtime/caml/osdeps.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
+ ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/osdeps.h \
+ ../../runtime/caml/memory.h unixsupport.h
 read.o: read.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/misc.h ../../runtime/caml/memory.h \
-  ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/signals.h unixsupport.h
 readdir.o: readdir.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/fail.h ../../runtime/caml/alloc.h \
-  ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/signals.h unixsupport.h
 readlink.o: readlink.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/alloc.h \
-  ../../runtime/caml/fail.h ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/fail.h \
+ ../../runtime/caml/signals.h unixsupport.h
 rename.o: rename.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/signals.h unixsupport.h
 rewinddir.o: rewinddir.c ../../runtime/caml/fail.h \
-  ../../runtime/caml/misc.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/mlvalues.h unixsupport.h
+ ../../runtime/caml/misc.h ../../runtime/caml/config.h \
+ ../../runtime/caml/m.h ../../runtime/caml/s.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/mlvalues.h \
+ unixsupport.h
 rmdir.o: rmdir.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
-  ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
-  ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
-  ../../runtime/caml/signals.h ../../runtime/caml/osdeps.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/signals.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h unixsupport.h
 select.o: select.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/fail.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/signals.h unixsupport.h
 sendrecv.o: sendrecv.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/fail.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/signals.h unixsupport.h \
-  socketaddr.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/signals.h unixsupport.h socketaddr.h \
+ ../../runtime/caml/misc.h
 setgid.o: setgid.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
 setgroups.o: setgroups.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/fail.h \
-  ../../runtime/caml/memory.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/memory.h unixsupport.h
 setsid.o: setsid.c ../../runtime/caml/fail.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/mlvalues.h unixsupport.h
 setuid.o: setuid.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
 shutdown.o: shutdown.c ../../runtime/caml/fail.h \
-  ../../runtime/caml/misc.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/mlvalues.h unixsupport.h
+ ../../runtime/caml/misc.h ../../runtime/caml/config.h \
+ ../../runtime/caml/m.h ../../runtime/caml/s.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/mlvalues.h \
+ unixsupport.h
 signals.o: signals.c ../../runtime/caml/alloc.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/fail.h ../../runtime/caml/memory.h \
-  ../../runtime/caml/gc.h ../../runtime/caml/major_gc.h \
-  ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
-  ../../runtime/caml/address_class.h ../../runtime/caml/signals.h \
-  unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/gc.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/signals.h unixsupport.h
 sleep.o: sleep.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/signals.h ../../runtime/caml/mlvalues.h unixsupport.h
 socket.o: socket.c ../../runtime/caml/fail.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/mlvalues.h unixsupport.h
 socketaddr.o: socketaddr.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/memory.h unixsupport.h \
-  socketaddr.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/memory.h unixsupport.h socketaddr.h \
+ ../../runtime/caml/misc.h
 socketpair.o: socketpair.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/fail.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h unixsupport.h
 sockopt.o: sockopt.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/alloc.h \
-  ../../runtime/caml/fail.h unixsupport.h socketaddr.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/fail.h unixsupport.h \
+ socketaddr.h ../../runtime/caml/misc.h
 stat.o: stat.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/misc.h ../../runtime/caml/memory.h \
-  ../../runtime/caml/gc.h ../../runtime/caml/major_gc.h \
-  ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
-  ../../runtime/caml/address_class.h ../../runtime/caml/alloc.h \
-  ../../runtime/caml/signals.h ../../runtime/caml/io.h unixsupport.h \
-  cst2constr.h nanosecond_stat.h
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/alloc.h \
+ ../../runtime/caml/signals.h ../../runtime/caml/io.h unixsupport.h \
+ cst2constr.h nanosecond_stat.h
 strofaddr.o: strofaddr.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/fail.h unixsupport.h \
-  socketaddr.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h unixsupport.h socketaddr.h \
+ ../../runtime/caml/misc.h
 symlink.o: symlink.c ../../runtime/caml/fail.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/signals.h unixsupport.h
 termios.o: termios.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/fail.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h unixsupport.h
 time.o: time.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/misc.h ../../runtime/caml/alloc.h unixsupport.h
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h unixsupport.h
 times.o: times.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/memory.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/memory.h unixsupport.h
 truncate.o: truncate.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
-  ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
-  ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
-  ../../runtime/caml/fail.h ../../runtime/caml/signals.h \
-  ../../runtime/caml/io.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/fail.h \
+ ../../runtime/caml/signals.h ../../runtime/caml/io.h unixsupport.h
 umask.o: umask.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
 unixsupport.o: unixsupport.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/alloc.h ../../runtime/caml/callback.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/fail.h unixsupport.h \
-  cst2constr.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/callback.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/fail.h unixsupport.h cst2constr.h
 unlink.o: unlink.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
-  ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
-  ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
-  ../../runtime/caml/signals.h ../../runtime/caml/osdeps.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/signals.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h unixsupport.h
 utimes.o: utimes.c ../../runtime/caml/fail.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
-  ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
-  ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
-  ../../runtime/caml/signals.h ../../runtime/caml/osdeps.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/gc.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/signals.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h unixsupport.h
 wait.o: wait.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
-  ../../runtime/caml/m.h ../../runtime/caml/s.h \
-  ../../runtime/caml/misc.h ../../runtime/caml/alloc.h \
-  ../../runtime/caml/fail.h ../../runtime/caml/memory.h \
-  ../../runtime/caml/gc.h ../../runtime/caml/major_gc.h \
-  ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
-  ../../runtime/caml/address_class.h ../../runtime/caml/signals.h \
-  unixsupport.h
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/gc.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/signals.h \
+ unixsupport.h
 write.o: write.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/signals.h unixsupport.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/signals.h unixsupport.h
 unix.cmo : \
     unix.cmi
 unix.cmx : \

diff --git a/otherlibs/win32unix/.depend b/otherlibs/win32unix/.depend
index 6de1127e7f5c440668c881848603978edfd479c1..92f2a0e8689d87889a3c52eac5524737d42a9919 100644 (file)
--- a/otherlibs/win32unix/.depend
+++ b/otherlibs/win32unix/.depend
@@ -1,15 +1,430 @@
+accept.$(O): accept.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/signals.h unixsupport.h \
+ socketaddr.h ../../runtime/caml/misc.h
+bind.$(O): bind.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ unixsupport.h socketaddr.h ../../runtime/caml/misc.h
+channels.$(O): channels.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/io.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/gc.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h unixsupport.h
+close.$(O): close.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h \
+ ../../runtime/caml/io.h
+close_on.$(O): close_on.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
+connect.$(O): connect.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/signals.h ../../runtime/caml/mlvalues.h unixsupport.h \
+ socketaddr.h ../../runtime/caml/misc.h
+createprocess.$(O): createprocess.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h unixsupport.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h
+dup.$(O): dup.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ unixsupport.h
+dup2.$(O): dup2.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ unixsupport.h
+errmsg.$(O): errmsg.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/gc.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h unixsupport.h
+envir.$(O): envir.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
+ ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h
+getpeername.$(O): getpeername.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h \
+ socketaddr.h ../../runtime/caml/misc.h
+getpid.$(O): getpid.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
+getsockname.$(O): getsockname.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h \
+ socketaddr.h ../../runtime/caml/misc.h
+gettimeofday.$(O): gettimeofday.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h unixsupport.h
+isatty.$(O): isatty.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/gc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
+ ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
+ unixsupport.h
+link.$(O): link.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
+ ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h unixsupport.h
+listen.$(O): listen.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
+lockf.$(O): lockf.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h unixsupport.h ../../runtime/caml/signals.h
+lseek.$(O): lseek.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h unixsupport.h
+nonblock.$(O): nonblock.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/signals.h ../../runtime/caml/mlvalues.h unixsupport.h
+mkdir.$(O): mkdir.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/gc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
+ ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
+ ../../runtime/caml/memory.h unixsupport.h
+mmap.$(O): mmap.c ../../runtime/caml/alloc.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/bigarray.h ../../runtime/caml/fail.h \
+ ../../runtime/caml/io.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/signals.h ../../runtime/caml/sys.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/gc.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h unixsupport.h
+open.$(O): open.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/gc.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/memory.h \
+ unixsupport.h
+pipe.$(O): pipe.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/alloc.h unixsupport.h
+read.$(O): read.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/signals.h unixsupport.h
+readlink.$(O): readlink.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/alloc.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/signals.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h unixsupport.h
+rename.$(O): rename.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/gc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
+ ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
+ ../../runtime/caml/memory.h unixsupport.h
+select.$(O): select.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/fail.h \
+ ../../runtime/caml/signals.h winworker.h unixsupport.h windbug.h \
+ winlist.h
+sendrecv.$(O): sendrecv.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/signals.h unixsupport.h \
+ socketaddr.h ../../runtime/caml/misc.h
+shutdown.$(O): shutdown.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
+sleep.$(O): sleep.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/signals.h ../../runtime/caml/mlvalues.h unixsupport.h
+socket.$(O): socket.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h unixsupport.h
+sockopt.$(O): sockopt.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/fail.h unixsupport.h \
+ socketaddr.h ../../runtime/caml/misc.h
+startup.$(O): startup.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h winworker.h \
+ unixsupport.h windbug.h
+stat.$(O): stat.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/alloc.h \
+ ../../runtime/caml/signals.h ../../runtime/caml/osdeps.h \
+ ../../runtime/caml/memory.h unixsupport.h ../unix/cst2constr.h
+symlink.$(O): symlink.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/alloc.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/signals.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h unixsupport.h
+system.$(O): system.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/alloc.h \
+ ../../runtime/caml/signals.h ../../runtime/caml/osdeps.h \
+ ../../runtime/caml/memory.h unixsupport.h
+times.$(O): times.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h unixsupport.h
+unixsupport.$(O): unixsupport.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/callback.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/custom.h unixsupport.h \
+ ../unix/cst2constr.h
+windir.$(O): windir.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/alloc.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/osdeps.h \
+ ../../runtime/caml/memory.h unixsupport.h
+winwait.$(O): winwait.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/signals.h unixsupport.h
+write.$(O): write.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/signals.h unixsupport.h
+winlist.$(O): winlist.c winlist.h
+winworker.$(O): winworker.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/signals.h winworker.h \
+ unixsupport.h winlist.h windbug.h
 windbug.$(O): windbug.c windbug.h
+utimes.$(O): utimes.c ../../runtime/caml/fail.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/gc.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/signals.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h unixsupport.h
+access.$(O): access.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/signals.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h unixsupport.h
+addrofstr.$(O): addrofstr.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h unixsupport.h socketaddr.h \
+ ../../runtime/caml/misc.h
+chdir.$(O): chdir.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/signals.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h unixsupport.h
+chmod.$(O): chmod.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/signals.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h unixsupport.h
 cst2constr.$(O): cst2constr.c ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/fail.h ../unix/cst2constr.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/mlvalues.h \
+ ../unix/cst2constr.h
+cstringv.$(O): cstringv.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/osdeps.h \
+ ../../runtime/caml/memory.h unixsupport.h
+execv.$(O): execv.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/osdeps.h \
+ ../../runtime/caml/memory.h unixsupport.h
+execve.$(O): execve.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/osdeps.h \
+ ../../runtime/caml/memory.h unixsupport.h
+execvp.$(O): execvp.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h unixsupport.h
+exit.$(O): exit.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ unixsupport.h
+getaddrinfo.$(O): getaddrinfo.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/misc.h ../../runtime/caml/signals.h unixsupport.h \
+ ../unix/cst2constr.h socketaddr.h
+getcwd.$(O): getcwd.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/osdeps.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
+ ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
+ unixsupport.h
+gethost.$(O): gethost.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/signals.h unixsupport.h socketaddr.h \
+ ../../runtime/caml/misc.h
+gethostname.$(O): gethostname.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h unixsupport.h
+getnameinfo.$(O): getnameinfo.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/memory.h \
+ ../../runtime/caml/signals.h unixsupport.h socketaddr.h \
+ ../../runtime/caml/misc.h
+getproto.$(O): getproto.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/memory.h unixsupport.h
+getserv.$(O): getserv.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/memory.h unixsupport.h
+gmtime.$(O): gmtime.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h ../../runtime/caml/memory.h unixsupport.h
 mmap_ba.$(O): mmap_ba.c ../../runtime/caml/alloc.h ../../runtime/caml/misc.h \
-  ../../runtime/caml/config.h ../../runtime/caml/m.h \
-  ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
-  ../../runtime/caml/bigarray.h ../../runtime/caml/custom.h \
-  ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
-  ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
-  ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/bigarray.h ../../runtime/caml/custom.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
+ ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
+ ../../runtime/caml/misc.h
+putenv.$(O): putenv.c ../../runtime/caml/fail.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/major_gc.h ../../runtime/caml/freelist.h \
+ ../../runtime/caml/minor_gc.h ../../runtime/caml/address_class.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/osdeps.h \
+ ../../runtime/caml/memory.h unixsupport.h
+rmdir.$(O): rmdir.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/signals.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h unixsupport.h
+socketaddr.$(O): socketaddr.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/memory.h unixsupport.h socketaddr.h \
+ ../../runtime/caml/misc.h
+strofaddr.$(O): strofaddr.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/fail.h unixsupport.h socketaddr.h \
+ ../../runtime/caml/misc.h
+time.$(O): time.c ../../runtime/caml/mlvalues.h ../../runtime/caml/config.h \
+ ../../runtime/caml/m.h ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/alloc.h ../../runtime/caml/mlvalues.h unixsupport.h
+unlink.$(O): unlink.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/memory.h ../../runtime/caml/gc.h \
+ ../../runtime/caml/mlvalues.h ../../runtime/caml/major_gc.h \
+ ../../runtime/caml/freelist.h ../../runtime/caml/minor_gc.h \
+ ../../runtime/caml/address_class.h ../../runtime/caml/signals.h \
+ ../../runtime/caml/osdeps.h ../../runtime/caml/memory.h unixsupport.h
+fsync.$(O): fsync.c ../../runtime/caml/mlvalues.h \
+ ../../runtime/caml/config.h ../../runtime/caml/m.h \
+ ../../runtime/caml/s.h ../../runtime/caml/misc.h \
+ ../../runtime/caml/signals.h ../../runtime/caml/mlvalues.h unixsupport.h
 unix.cmo : \
     unix.cmi
 unix.cmx : \

diff --git a/parsing/ast_iterator.mli b/parsing/ast_iterator.mli
index 5dc1c0ec5a64651f416803bc27d200b2ea0e56c7..26308d20dee8b2b45e7f5eadbf2152d6148a600c 100755 (executable)
--- a/parsing/ast_iterator.mli
+++ b/parsing/ast_iterator.mli
@@ -13,7 +13,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-(** {!iterator} allows to implement AST inspection using open recursion.  A
+(** {!iterator} enables AST inspection using open recursion.  A
     typical mapper would be based on {!default_iterator}, a trivial iterator,
     and will fall back on it for handling the syntax it does not modify.
 

diff --git a/parsing/ast_mapper.mli b/parsing/ast_mapper.mli
index b342ca8a9e550935451b6960a40f78394ed7367d..80d70fcca51721466e9641b874d742c66f58aae1 100644 (file)
--- a/parsing/ast_mapper.mli
+++ b/parsing/ast_mapper.mli
@@ -21,7 +21,7 @@
   the -ppx rewriters, handling such details as the serialization format,
   forwarding of command-line flags, and storing state.
 
-  {!mapper} allows to implement AST rewriting using open recursion.
+  {!mapper} enables AST rewriting using open recursion.
   A typical mapper would be based on {!default_mapper}, a deep
   identity mapper, and will fall back on it for handling the syntax it
   does not modify. For example:

diff --git a/runtime/.depend b/runtime/.depend
index 2567f40974897d1645aedceb9338e8afbd2d0986..3b707ee490be6ed4437918ae84fe3032fd07f6d0 100644 (file)
--- a/runtime/.depend
+++ b/runtime/.depend
@@ -1,2178 +1,2592 @@
-afl_b.$(O): afl.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/mlvalues.h \
-  caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h
+afl_b.$(O): afl.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/config.h \
+ caml/mlvalues.h caml/misc.h caml/osdeps.h caml/memory.h caml/gc.h \
+ caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 alloc_b.$(O): alloc.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/custom.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/stacks.h
+ caml/mlvalues.h caml/custom.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/stacks.h caml/memory.h
 array_b.$(O): array.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/signals.h \
-  caml/spacetime.h caml/io.h caml/stack.h
+ caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/mlvalues.h caml/signals.h caml/spacetime.h caml/io.h caml/stack.h
 backtrace_b.$(O): backtrace.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/backtrace.h \
-  caml/exec.h caml/backtrace_prim.h caml/fail.h
+ caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/backtrace.h \
+ caml/exec.h caml/backtrace_prim.h caml/backtrace.h caml/fail.h
 backtrace_byt_b.$(O): backtrace_byt.c caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/misc.h caml/alloc.h caml/custom.h caml/io.h \
-  caml/instruct.h caml/intext.h caml/exec.h caml/fix_code.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/startup.h caml/stacks.h \
-  caml/sys.h caml/backtrace.h caml/fail.h caml/backtrace_prim.h
+ caml/mlvalues.h caml/config.h caml/misc.h caml/alloc.h caml/mlvalues.h \
+ caml/custom.h caml/io.h caml/instruct.h caml/intext.h caml/io.h \
+ caml/exec.h caml/fix_code.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/startup.h \
+ caml/exec.h caml/stacks.h caml/memory.h caml/sys.h caml/backtrace.h \
+ caml/fail.h caml/backtrace_prim.h caml/backtrace.h
 backtrace_nat_b.$(O): backtrace_nat.c caml/alloc.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
-  caml/backtrace_prim.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/stack.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
+ caml/backtrace_prim.h caml/backtrace.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/misc.h caml/mlvalues.h caml/stack.h
 bigarray_b.$(O): bigarray.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/bigarray.h caml/custom.h caml/fail.h \
-  caml/intext.h caml/io.h caml/hash.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/signals.h
+ caml/s.h caml/mlvalues.h caml/bigarray.h caml/custom.h caml/fail.h \
+ caml/intext.h caml/io.h caml/hash.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/signals.h
 callback_b.$(O): callback.c caml/callback.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/interp.h caml/instruct.h caml/fix_code.h caml/stacks.h
+ caml/m.h caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/interp.h caml/instruct.h caml/fix_code.h \
+ caml/stacks.h caml/memory.h
 clambda_checks_b.$(O): clambda_checks.c caml/mlvalues.h caml/config.h caml/m.h \
-  caml/s.h caml/misc.h
+ caml/s.h caml/misc.h
 compact_b.$(O): compact.c caml/address_class.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/finalise.h caml/roots.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/gc_ctrl.h caml/weak.h caml/compact.h
+ caml/misc.h caml/mlvalues.h caml/config.h caml/finalise.h caml/roots.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/freelist.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/mlvalues.h caml/roots.h caml/weak.h \
+ caml/compact.h
 compare_b.$(O): compare.c caml/custom.h caml/mlvalues.h caml/config.h caml/m.h \
-  caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/mlvalues.h
 custom_b.$(O): custom.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc_ctrl.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/signals.h
+ caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc_ctrl.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/signals.h
 debugger_b.$(O): debugger.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/debugger.h caml/osdeps.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/fail.h caml/fix_code.h caml/instruct.h \
-  caml/intext.h caml/io.h caml/stacks.h caml/sys.h
+ caml/s.h caml/mlvalues.h caml/config.h caml/debugger.h caml/misc.h \
+ caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/fail.h caml/fix_code.h \
+ caml/instruct.h caml/intext.h caml/io.h caml/io.h caml/mlvalues.h \
+ caml/stacks.h caml/sys.h
 dynlink_b.$(O): dynlink.c caml/config.h caml/m.h caml/s.h caml/alloc.h \
-  caml/misc.h caml/mlvalues.h caml/dynlink.h caml/fail.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/osdeps.h caml/prims.h caml/signals.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/dynlink.h caml/fail.h \
+ caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/misc.h caml/osdeps.h \
+ caml/memory.h caml/prims.h caml/signals.h
 dynlink_nat_b.$(O): dynlink_nat.c caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/stack.h \
-  caml/callback.h caml/alloc.h caml/intext.h caml/io.h caml/osdeps.h \
-  caml/fail.h caml/signals.h caml/hooks.h
+ caml/mlvalues.h caml/misc.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/stack.h caml/callback.h caml/alloc.h caml/intext.h caml/io.h \
+ caml/osdeps.h caml/memory.h caml/fail.h caml/signals.h caml/hooks.h
 extern_b.$(O): extern.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc.h \
-  caml/intext.h caml/io.h caml/md5.h caml/memory.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/reverse.h
+ caml/s.h caml/mlvalues.h caml/config.h caml/custom.h caml/fail.h \
+ caml/gc.h caml/intext.h caml/io.h caml/io.h caml/md5.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/reverse.h
 fail_byt_b.$(O): fail_byt.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/printexc.h caml/signals.h caml/stacks.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/printexc.h \
+ caml/signals.h caml/stacks.h caml/memory.h
 fail_nat_b.$(O): fail_nat.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/printexc.h caml/signals.h caml/stack.h caml/roots.h \
-  caml/callback.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/printexc.h caml/signals.h \
+ caml/stack.h caml/roots.h caml/memory.h caml/callback.h
 finalise_b.$(O): finalise.c caml/callback.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/compact.h caml/fail.h \
-  caml/finalise.h caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/signals.h
+ caml/m.h caml/s.h caml/misc.h caml/compact.h caml/fail.h caml/finalise.h \
+ caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/minor_gc.h caml/mlvalues.h \
+ caml/roots.h caml/signals.h
 fix_code_b.$(O): fix_code.c caml/config.h caml/m.h caml/s.h caml/debugger.h \
-  caml/misc.h caml/mlvalues.h caml/fix_code.h caml/instruct.h \
-  caml/intext.h caml/io.h caml/md5.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/fix_code.h \
+ caml/instruct.h caml/intext.h caml/io.h caml/md5.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/reverse.h
 floats_b.$(O): floats.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h caml/stacks.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/misc.h caml/reverse.h caml/stacks.h caml/memory.h
 freelist_b.$(O): freelist.c caml/config.h caml/m.h caml/s.h caml/freelist.h \
-  caml/misc.h caml/mlvalues.h caml/gc.h caml/gc_ctrl.h caml/memory.h \
-  caml/major_gc.h caml/minor_gc.h caml/address_class.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/gc.h caml/gc_ctrl.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/major_gc.h caml/misc.h caml/mlvalues.h
 gc_ctrl_b.$(O): gc_ctrl.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/compact.h \
-  caml/custom.h caml/fail.h caml/finalise.h caml/roots.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/gc_ctrl.h caml/signals.h caml/stacks.h \
-  caml/startup_aux.h
+ caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/compact.h \
+ caml/custom.h caml/fail.h caml/finalise.h caml/roots.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/freelist.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/minor_gc.h caml/misc.h \
+ caml/mlvalues.h caml/signals.h caml/stacks.h caml/startup_aux.h
 globroots_b.$(O): globroots.c caml/memory.h caml/config.h caml/m.h caml/s.h \
-  caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/roots.h caml/globroots.h
+ caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/memory.h caml/globroots.h caml/roots.h
 hash_b.$(O): hash.c caml/mlvalues.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/custom.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/hash.h
+ caml/misc.h caml/custom.h caml/mlvalues.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/hash.h
 instrtrace_b.$(O): instrtrace.c
 intern_b.$(O): intern.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/callback.h caml/custom.h caml/fail.h \
-  caml/gc.h caml/intext.h caml/io.h caml/md5.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h
+ caml/s.h caml/mlvalues.h caml/callback.h caml/config.h caml/custom.h \
+ caml/fail.h caml/gc.h caml/intext.h caml/io.h caml/io.h caml/md5.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/misc.h caml/reverse.h
 interp_b.$(O): interp.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/callback.h \
-  caml/debugger.h caml/fail.h caml/fix_code.h caml/instrtrace.h \
-  caml/instruct.h caml/interp.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/prims.h caml/signals.h caml/stacks.h caml/startup_aux.h \
-  caml/jumptbl.h
+ caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/callback.h \
+ caml/debugger.h caml/fail.h caml/fix_code.h caml/instrtrace.h \
+ caml/instruct.h caml/interp.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/prims.h \
+ caml/signals.h caml/stacks.h caml/memory.h caml/startup_aux.h \
+ caml/jumptbl.h
 ints_b.$(O): ints.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/custom.h caml/fail.h caml/intext.h caml/io.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/custom.h caml/fail.h caml/intext.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h
 io_b.$(O): io.c caml/config.h caml/m.h caml/s.h caml/alloc.h caml/misc.h \
-  caml/mlvalues.h caml/custom.h caml/fail.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/osdeps.h caml/signals.h caml/sys.h
+ caml/config.h caml/mlvalues.h caml/custom.h caml/fail.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/osdeps.h \
+ caml/memory.h caml/signals.h caml/sys.h
 lexing_b.$(O): lexing.c caml/fail.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/stacks.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/s.h caml/mlvalues.h caml/mlvalues.h caml/stacks.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 main_b.$(O): main.c caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/sys.h caml/osdeps.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/misc.h caml/sys.h caml/osdeps.h caml/memory.h \
+ caml/gc.h caml/mlvalues.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 major_gc_b.$(O): major_gc.c caml/compact.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/custom.h caml/fail.h caml/finalise.h \
-  caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/gc_ctrl.h caml/signals.h \
-  caml/weak.h
+ caml/misc.h caml/mlvalues.h caml/custom.h caml/config.h caml/fail.h \
+ caml/finalise.h caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/freelist.h \
+ caml/gc.h caml/gc_ctrl.h caml/major_gc.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/signals.h caml/weak.h
 md5_b.$(O): md5.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/md5.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/reverse.h
+ caml/mlvalues.h caml/fail.h caml/md5.h caml/io.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/io.h caml/reverse.h
 memory_b.$(O): memory.c caml/address_class.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/fail.h caml/freelist.h caml/gc.h \
-  caml/gc_ctrl.h caml/major_gc.h caml/memory.h caml/minor_gc.h \
-  caml/signals.h
+ caml/misc.h caml/mlvalues.h caml/config.h caml/fail.h caml/freelist.h \
+ caml/gc.h caml/gc_ctrl.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/signals.h
 meta_b.$(O): meta.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/fix_code.h caml/interp.h \
-  caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
-  caml/gc.h caml/minor_gc.h caml/address_class.h caml/prims.h \
-  caml/stacks.h caml/backtrace_prim.h caml/backtrace.h caml/exec.h
+ caml/mlvalues.h caml/config.h caml/fail.h caml/fix_code.h caml/interp.h \
+ caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/prims.h caml/stacks.h \
+ caml/memory.h caml/backtrace_prim.h caml/backtrace.h caml/exec.h
 minor_gc_b.$(O): minor_gc.c caml/custom.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/fail.h caml/finalise.h caml/roots.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/gc_ctrl.h caml/signals.h \
-  caml/weak.h
-misc_b.$(O): misc.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/memory.h \
-  caml/gc.h caml/mlvalues.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/osdeps.h caml/version.h
+ caml/m.h caml/s.h caml/misc.h caml/config.h caml/fail.h caml/finalise.h \
+ caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/minor_gc.h caml/misc.h \
+ caml/mlvalues.h caml/roots.h caml/signals.h caml/weak.h
+misc_b.$(O): misc.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/config.h \
+ caml/memory.h caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
+ caml/memory.h caml/version.h
 obj_b.$(O): obj.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/gc.h caml/interp.h caml/major_gc.h \
-  caml/freelist.h caml/memory.h caml/minor_gc.h caml/address_class.h \
-  caml/prims.h caml/spacetime.h caml/io.h caml/stack.h
+ caml/mlvalues.h caml/fail.h caml/gc.h caml/interp.h caml/major_gc.h \
+ caml/freelist.h caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/prims.h caml/spacetime.h caml/io.h caml/stack.h
 parsing_b.$(O): parsing.c caml/config.h caml/m.h caml/s.h caml/mlvalues.h \
-  caml/misc.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/alloc.h
+ caml/config.h caml/misc.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/alloc.h
 prims_b.$(O): prims.c caml/mlvalues.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/prims.h
+ caml/misc.h caml/prims.h
 printexc_b.$(O): printexc.c caml/backtrace.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/exec.h caml/callback.h \
-  caml/debugger.h caml/fail.h caml/printexc.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/m.h caml/s.h caml/misc.h caml/exec.h caml/callback.h \
+ caml/debugger.h caml/fail.h caml/misc.h caml/mlvalues.h caml/printexc.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 roots_byt_b.$(O): roots_byt.c caml/finalise.h caml/roots.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h \
-  caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/globroots.h caml/stacks.h
+ caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/globroots.h caml/major_gc.h caml/memory.h caml/minor_gc.h \
+ caml/misc.h caml/mlvalues.h caml/roots.h caml/stacks.h
 roots_nat_b.$(O): roots_nat.c caml/finalise.h caml/roots.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h \
-  caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/globroots.h caml/stack.h
+ caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/globroots.h caml/memory.h caml/major_gc.h caml/minor_gc.h \
+ caml/misc.h caml/mlvalues.h caml/stack.h caml/roots.h
 signals_b.$(O): signals.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/callback.h caml/fail.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/roots.h caml/signals.h \
-  caml/signals_machdep.h caml/sys.h
+ caml/s.h caml/mlvalues.h caml/callback.h caml/config.h caml/fail.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/roots.h \
+ caml/memory.h caml/signals.h caml/signals_machdep.h caml/sys.h
 signals_byt_b.$(O): signals_byt.c caml/config.h caml/m.h caml/s.h \
-  caml/memory.h caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/signals.h caml/signals_machdep.h
+ caml/memory.h caml/config.h caml/gc.h caml/mlvalues.h caml/misc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/signals_machdep.h
 signals_nat_b.$(O): signals_nat.c caml/fail.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/osdeps.h caml/signals.h caml/signals_machdep.h signals_osdep.h \
-  caml/stack.h caml/spacetime.h caml/io.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/signals_machdep.h \
+ signals_osdep.h caml/stack.h caml/spacetime.h caml/io.h caml/stack.h
 spacetime_byt_b.$(O): spacetime_byt.c caml/fail.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/mlvalues.h
 spacetime_nat_b.$(O): spacetime_nat.c caml/config.h caml/m.h caml/s.h \
-  caml/alloc.h caml/misc.h caml/mlvalues.h caml/backtrace_prim.h \
-  caml/backtrace.h caml/exec.h caml/fail.h caml/gc.h caml/intext.h \
-  caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
-  caml/minor_gc.h caml/address_class.h caml/osdeps.h caml/roots.h \
-  caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h
+ caml/alloc.h caml/misc.h caml/config.h caml/mlvalues.h \
+ caml/backtrace_prim.h caml/backtrace.h caml/exec.h caml/fail.h caml/gc.h \
+ caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h \
+ caml/roots.h caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h \
+ caml/stack.h
 spacetime_snapshot_b.$(O): spacetime_snapshot.c caml/alloc.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/mlvalues.h caml/backtrace_prim.h \
-  caml/backtrace.h caml/exec.h caml/custom.h caml/fail.h caml/gc.h \
-  caml/gc_ctrl.h caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/minor_gc.h caml/address_class.h caml/roots.h \
-  caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h
+ caml/config.h caml/m.h caml/s.h caml/mlvalues.h caml/backtrace_prim.h \
+ caml/backtrace.h caml/exec.h caml/config.h caml/custom.h caml/fail.h \
+ caml/gc.h caml/gc_ctrl.h caml/intext.h caml/io.h caml/major_gc.h \
+ caml/freelist.h caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/memory.h caml/signals.h caml/stack.h caml/sys.h \
+ caml/spacetime.h caml/stack.h
 stacks_b.$(O): stacks.c caml/config.h caml/m.h caml/s.h caml/fail.h \
-  caml/misc.h caml/mlvalues.h caml/stacks.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/misc.h caml/mlvalues.h \
+ caml/stacks.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 startup_aux_b.$(O): startup_aux.c caml/backtrace.h caml/mlvalues.h \
-  caml/config.h caml/m.h caml/s.h caml/misc.h caml/exec.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/callback.h caml/dynlink.h caml/osdeps.h \
-  caml/startup_aux.h
+ caml/config.h caml/m.h caml/s.h caml/misc.h caml/exec.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/callback.h caml/major_gc.h caml/dynlink.h \
+ caml/osdeps.h caml/memory.h caml/startup_aux.h
 startup_byt_b.$(O): startup_byt.c caml/config.h caml/m.h caml/s.h caml/alloc.h \
-  caml/misc.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
-  caml/callback.h caml/custom.h caml/debugger.h caml/dynlink.h \
-  caml/fail.h caml/fix_code.h caml/freelist.h caml/gc_ctrl.h \
-  caml/instrtrace.h caml/interp.h caml/intext.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
-  caml/osdeps.h caml/prims.h caml/printexc.h caml/reverse.h \
-  caml/signals.h caml/stacks.h caml/sys.h caml/startup.h \
-  caml/startup_aux.h caml/version.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
+ caml/callback.h caml/custom.h caml/debugger.h caml/dynlink.h caml/exec.h \
+ caml/fail.h caml/fix_code.h caml/freelist.h caml/gc_ctrl.h \
+ caml/instrtrace.h caml/interp.h caml/intext.h caml/io.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/osdeps.h caml/memory.h caml/prims.h caml/printexc.h caml/reverse.h \
+ caml/signals.h caml/stacks.h caml/sys.h caml/startup.h \
+ caml/startup_aux.h caml/version.h
 startup_nat_b.$(O): startup_nat.c caml/callback.h caml/mlvalues.h \
-  caml/config.h caml/m.h caml/s.h caml/misc.h caml/backtrace.h \
-  caml/exec.h caml/custom.h caml/debugger.h caml/fail.h caml/freelist.h \
-  caml/gc.h caml/gc_ctrl.h caml/intext.h caml/io.h caml/memory.h \
-  caml/major_gc.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/printexc.h caml/stack.h caml/startup_aux.h caml/sys.h
+ caml/config.h caml/m.h caml/s.h caml/misc.h caml/backtrace.h caml/exec.h \
+ caml/custom.h caml/debugger.h caml/fail.h caml/freelist.h caml/gc.h \
+ caml/gc_ctrl.h caml/intext.h caml/io.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h caml/printexc.h \
+ caml/stack.h caml/startup_aux.h caml/sys.h
 str_b.$(O): str.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/mlvalues.h \
+ caml/misc.h
 sys_b.$(O): sys.c caml/config.h caml/m.h caml/s.h caml/alloc.h caml/misc.h \
-  caml/mlvalues.h caml/debugger.h caml/fail.h caml/gc_ctrl.h caml/io.h \
-  caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/signals.h caml/stacks.h \
-  caml/sys.h caml/version.h caml/callback.h caml/startup_aux.h
+ caml/config.h caml/mlvalues.h caml/debugger.h caml/fail.h caml/gc_ctrl.h \
+ caml/io.h caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/signals.h caml/stacks.h caml/sys.h \
+ caml/version.h caml/callback.h caml/startup_aux.h
 unix_b.$(O): unix.c caml/config.h caml/m.h caml/s.h caml/fail.h caml/misc.h \
-  caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/signals.h caml/sys.h caml/io.h caml/alloc.h
+ caml/config.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/sys.h caml/io.h \
+ caml/alloc.h
 weak_b.$(O): weak.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/weak.h caml/signals.h
-afl_bd.$(O): afl.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/mlvalues.h \
-  caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/fail.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/weak.h caml/minor_gc.h \
+ caml/signals.h
+win32_b.$(O): win32.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
+ caml/mlvalues.h caml/address_class.h caml/fail.h caml/io.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/osdeps.h caml/memory.h \
+ caml/signals.h caml/sys.h caml/config.h
+afl_bd.$(O): afl.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/config.h \
+ caml/mlvalues.h caml/misc.h caml/osdeps.h caml/memory.h caml/gc.h \
+ caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 alloc_bd.$(O): alloc.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/custom.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/stacks.h
+ caml/mlvalues.h caml/custom.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/stacks.h caml/memory.h
 array_bd.$(O): array.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/signals.h \
-  caml/spacetime.h caml/io.h caml/stack.h
+ caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/mlvalues.h caml/signals.h caml/spacetime.h caml/io.h caml/stack.h
 backtrace_bd.$(O): backtrace.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/backtrace.h \
-  caml/exec.h caml/backtrace_prim.h caml/fail.h
+ caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/backtrace.h \
+ caml/exec.h caml/backtrace_prim.h caml/backtrace.h caml/fail.h
 backtrace_byt_bd.$(O): backtrace_byt.c caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/misc.h caml/alloc.h caml/custom.h caml/io.h \
-  caml/instruct.h caml/intext.h caml/exec.h caml/fix_code.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/startup.h caml/stacks.h \
-  caml/sys.h caml/backtrace.h caml/fail.h caml/backtrace_prim.h
+ caml/mlvalues.h caml/config.h caml/misc.h caml/alloc.h caml/mlvalues.h \
+ caml/custom.h caml/io.h caml/instruct.h caml/intext.h caml/io.h \
+ caml/exec.h caml/fix_code.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/startup.h \
+ caml/exec.h caml/stacks.h caml/memory.h caml/sys.h caml/backtrace.h \
+ caml/fail.h caml/backtrace_prim.h caml/backtrace.h
 backtrace_nat_bd.$(O): backtrace_nat.c caml/alloc.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
-  caml/backtrace_prim.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/stack.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
+ caml/backtrace_prim.h caml/backtrace.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/misc.h caml/mlvalues.h caml/stack.h
 bigarray_bd.$(O): bigarray.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/bigarray.h caml/custom.h caml/fail.h \
-  caml/intext.h caml/io.h caml/hash.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/signals.h
+ caml/s.h caml/mlvalues.h caml/bigarray.h caml/custom.h caml/fail.h \
+ caml/intext.h caml/io.h caml/hash.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/signals.h
 callback_bd.$(O): callback.c caml/callback.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/interp.h caml/instruct.h caml/fix_code.h caml/stacks.h
+ caml/m.h caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/interp.h caml/instruct.h caml/fix_code.h \
+ caml/stacks.h caml/memory.h
 clambda_checks_bd.$(O): clambda_checks.c caml/mlvalues.h caml/config.h caml/m.h \
-  caml/s.h caml/misc.h
+ caml/s.h caml/misc.h
 compact_bd.$(O): compact.c caml/address_class.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/finalise.h caml/roots.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/gc_ctrl.h caml/weak.h caml/compact.h
+ caml/misc.h caml/mlvalues.h caml/config.h caml/finalise.h caml/roots.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/freelist.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/mlvalues.h caml/roots.h caml/weak.h \
+ caml/compact.h
 compare_bd.$(O): compare.c caml/custom.h caml/mlvalues.h caml/config.h caml/m.h \
-  caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/mlvalues.h
 custom_bd.$(O): custom.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc_ctrl.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/signals.h
+ caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc_ctrl.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/signals.h
 debugger_bd.$(O): debugger.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/debugger.h caml/osdeps.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/fail.h caml/fix_code.h caml/instruct.h \
-  caml/intext.h caml/io.h caml/stacks.h caml/sys.h
+ caml/s.h caml/mlvalues.h caml/config.h caml/debugger.h caml/misc.h \
+ caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/fail.h caml/fix_code.h \
+ caml/instruct.h caml/intext.h caml/io.h caml/io.h caml/mlvalues.h \
+ caml/stacks.h caml/sys.h
 dynlink_bd.$(O): dynlink.c caml/config.h caml/m.h caml/s.h caml/alloc.h \
-  caml/misc.h caml/mlvalues.h caml/dynlink.h caml/fail.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/osdeps.h caml/prims.h caml/signals.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/dynlink.h caml/fail.h \
+ caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/misc.h caml/osdeps.h \
+ caml/memory.h caml/prims.h caml/signals.h
 dynlink_nat_bd.$(O): dynlink_nat.c caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/stack.h \
-  caml/callback.h caml/alloc.h caml/intext.h caml/io.h caml/osdeps.h \
-  caml/fail.h caml/signals.h caml/hooks.h
+ caml/mlvalues.h caml/misc.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/stack.h caml/callback.h caml/alloc.h caml/intext.h caml/io.h \
+ caml/osdeps.h caml/memory.h caml/fail.h caml/signals.h caml/hooks.h
 extern_bd.$(O): extern.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc.h \
-  caml/intext.h caml/io.h caml/md5.h caml/memory.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/reverse.h
+ caml/s.h caml/mlvalues.h caml/config.h caml/custom.h caml/fail.h \
+ caml/gc.h caml/intext.h caml/io.h caml/io.h caml/md5.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/reverse.h
 fail_byt_bd.$(O): fail_byt.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/printexc.h caml/signals.h caml/stacks.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/printexc.h \
+ caml/signals.h caml/stacks.h caml/memory.h
 fail_nat_bd.$(O): fail_nat.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/printexc.h caml/signals.h caml/stack.h caml/roots.h \
-  caml/callback.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/printexc.h caml/signals.h \
+ caml/stack.h caml/roots.h caml/memory.h caml/callback.h
 finalise_bd.$(O): finalise.c caml/callback.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/compact.h caml/fail.h \
-  caml/finalise.h caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/signals.h
+ caml/m.h caml/s.h caml/misc.h caml/compact.h caml/fail.h caml/finalise.h \
+ caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/minor_gc.h caml/mlvalues.h \
+ caml/roots.h caml/signals.h
 fix_code_bd.$(O): fix_code.c caml/config.h caml/m.h caml/s.h caml/debugger.h \
-  caml/misc.h caml/mlvalues.h caml/fix_code.h caml/instruct.h \
-  caml/intext.h caml/io.h caml/md5.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/fix_code.h \
+ caml/instruct.h caml/intext.h caml/io.h caml/md5.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/reverse.h
 floats_bd.$(O): floats.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h caml/stacks.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/misc.h caml/reverse.h caml/stacks.h caml/memory.h
 freelist_bd.$(O): freelist.c caml/config.h caml/m.h caml/s.h caml/freelist.h \
-  caml/misc.h caml/mlvalues.h caml/gc.h caml/gc_ctrl.h caml/memory.h \
-  caml/major_gc.h caml/minor_gc.h caml/address_class.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/gc.h caml/gc_ctrl.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/major_gc.h caml/misc.h caml/mlvalues.h
 gc_ctrl_bd.$(O): gc_ctrl.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/compact.h \
-  caml/custom.h caml/fail.h caml/finalise.h caml/roots.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/gc_ctrl.h caml/signals.h caml/stacks.h \
-  caml/startup_aux.h
+ caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/compact.h \
+ caml/custom.h caml/fail.h caml/finalise.h caml/roots.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/freelist.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/minor_gc.h caml/misc.h \
+ caml/mlvalues.h caml/signals.h caml/stacks.h caml/startup_aux.h
 globroots_bd.$(O): globroots.c caml/memory.h caml/config.h caml/m.h caml/s.h \
-  caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/roots.h caml/globroots.h
+ caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/memory.h caml/globroots.h caml/roots.h
 hash_bd.$(O): hash.c caml/mlvalues.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/custom.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/hash.h
+ caml/misc.h caml/custom.h caml/mlvalues.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/hash.h
 instrtrace_bd.$(O): instrtrace.c caml/instrtrace.h caml/mlvalues.h \
-  caml/config.h caml/m.h caml/s.h caml/misc.h caml/instruct.h \
-  caml/opnames.h caml/prims.h caml/stacks.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/startup_aux.h
+ caml/config.h caml/m.h caml/s.h caml/misc.h caml/instruct.h caml/misc.h \
+ caml/mlvalues.h caml/opnames.h caml/prims.h caml/stacks.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/startup_aux.h
 intern_bd.$(O): intern.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/callback.h caml/custom.h caml/fail.h \
-  caml/gc.h caml/intext.h caml/io.h caml/md5.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h
+ caml/s.h caml/mlvalues.h caml/callback.h caml/config.h caml/custom.h \
+ caml/fail.h caml/gc.h caml/intext.h caml/io.h caml/io.h caml/md5.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/misc.h caml/reverse.h
 interp_bd.$(O): interp.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/callback.h \
-  caml/debugger.h caml/fail.h caml/fix_code.h caml/instrtrace.h \
-  caml/instruct.h caml/interp.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/prims.h caml/signals.h caml/stacks.h caml/startup_aux.h
+ caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/callback.h \
+ caml/debugger.h caml/fail.h caml/fix_code.h caml/instrtrace.h \
+ caml/instruct.h caml/interp.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/prims.h \
+ caml/signals.h caml/stacks.h caml/memory.h caml/startup_aux.h
 ints_bd.$(O): ints.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/custom.h caml/fail.h caml/intext.h caml/io.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/custom.h caml/fail.h caml/intext.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h
 io_bd.$(O): io.c caml/config.h caml/m.h caml/s.h caml/alloc.h caml/misc.h \
-  caml/mlvalues.h caml/custom.h caml/fail.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/osdeps.h caml/signals.h caml/sys.h
+ caml/config.h caml/mlvalues.h caml/custom.h caml/fail.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/osdeps.h \
+ caml/memory.h caml/signals.h caml/sys.h
 lexing_bd.$(O): lexing.c caml/fail.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/stacks.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/s.h caml/mlvalues.h caml/mlvalues.h caml/stacks.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 main_bd.$(O): main.c caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/sys.h caml/osdeps.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/misc.h caml/sys.h caml/osdeps.h caml/memory.h \
+ caml/gc.h caml/mlvalues.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 major_gc_bd.$(O): major_gc.c caml/compact.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/custom.h caml/fail.h caml/finalise.h \
-  caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/gc_ctrl.h caml/signals.h \
-  caml/weak.h
+ caml/misc.h caml/mlvalues.h caml/custom.h caml/config.h caml/fail.h \
+ caml/finalise.h caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/freelist.h \
+ caml/gc.h caml/gc_ctrl.h caml/major_gc.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/signals.h caml/weak.h
 md5_bd.$(O): md5.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/md5.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/reverse.h
+ caml/mlvalues.h caml/fail.h caml/md5.h caml/io.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/io.h caml/reverse.h
 memory_bd.$(O): memory.c caml/address_class.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/fail.h caml/freelist.h caml/gc.h \
-  caml/gc_ctrl.h caml/major_gc.h caml/memory.h caml/minor_gc.h \
-  caml/signals.h
+ caml/misc.h caml/mlvalues.h caml/config.h caml/fail.h caml/freelist.h \
+ caml/gc.h caml/gc_ctrl.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/signals.h
 meta_bd.$(O): meta.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/fix_code.h caml/interp.h \
-  caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
-  caml/gc.h caml/minor_gc.h caml/address_class.h caml/prims.h \
-  caml/stacks.h caml/backtrace_prim.h caml/backtrace.h caml/exec.h
+ caml/mlvalues.h caml/config.h caml/fail.h caml/fix_code.h caml/interp.h \
+ caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/prims.h caml/stacks.h \
+ caml/memory.h caml/backtrace_prim.h caml/backtrace.h caml/exec.h
 minor_gc_bd.$(O): minor_gc.c caml/custom.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/fail.h caml/finalise.h caml/roots.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/gc_ctrl.h caml/signals.h \
-  caml/weak.h
-misc_bd.$(O): misc.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/memory.h \
-  caml/gc.h caml/mlvalues.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/osdeps.h caml/version.h
+ caml/m.h caml/s.h caml/misc.h caml/config.h caml/fail.h caml/finalise.h \
+ caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/minor_gc.h caml/misc.h \
+ caml/mlvalues.h caml/roots.h caml/signals.h caml/weak.h
+misc_bd.$(O): misc.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/config.h \
+ caml/memory.h caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
+ caml/memory.h caml/version.h
 obj_bd.$(O): obj.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/gc.h caml/interp.h caml/major_gc.h \
-  caml/freelist.h caml/memory.h caml/minor_gc.h caml/address_class.h \
-  caml/prims.h caml/spacetime.h caml/io.h caml/stack.h
+ caml/mlvalues.h caml/fail.h caml/gc.h caml/interp.h caml/major_gc.h \
+ caml/freelist.h caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/prims.h caml/spacetime.h caml/io.h caml/stack.h
 parsing_bd.$(O): parsing.c caml/config.h caml/m.h caml/s.h caml/mlvalues.h \
-  caml/misc.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/alloc.h
+ caml/config.h caml/misc.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/alloc.h
 prims_bd.$(O): prims.c caml/mlvalues.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/prims.h
+ caml/misc.h caml/prims.h
 printexc_bd.$(O): printexc.c caml/backtrace.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/exec.h caml/callback.h \
-  caml/debugger.h caml/fail.h caml/printexc.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/m.h caml/s.h caml/misc.h caml/exec.h caml/callback.h \
+ caml/debugger.h caml/fail.h caml/misc.h caml/mlvalues.h caml/printexc.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 roots_byt_bd.$(O): roots_byt.c caml/finalise.h caml/roots.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h \
-  caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/globroots.h caml/stacks.h
+ caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/globroots.h caml/major_gc.h caml/memory.h caml/minor_gc.h \
+ caml/misc.h caml/mlvalues.h caml/roots.h caml/stacks.h
 roots_nat_bd.$(O): roots_nat.c caml/finalise.h caml/roots.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h \
-  caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/globroots.h caml/stack.h
+ caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/globroots.h caml/memory.h caml/major_gc.h caml/minor_gc.h \
+ caml/misc.h caml/mlvalues.h caml/stack.h caml/roots.h
 signals_bd.$(O): signals.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/callback.h caml/fail.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/roots.h caml/signals.h \
-  caml/signals_machdep.h caml/sys.h
+ caml/s.h caml/mlvalues.h caml/callback.h caml/config.h caml/fail.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/roots.h \
+ caml/memory.h caml/signals.h caml/signals_machdep.h caml/sys.h
 signals_byt_bd.$(O): signals_byt.c caml/config.h caml/m.h caml/s.h \
-  caml/memory.h caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/signals.h caml/signals_machdep.h
+ caml/memory.h caml/config.h caml/gc.h caml/mlvalues.h caml/misc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/signals_machdep.h
 signals_nat_bd.$(O): signals_nat.c caml/fail.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/osdeps.h caml/signals.h caml/signals_machdep.h signals_osdep.h \
-  caml/stack.h caml/spacetime.h caml/io.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/signals_machdep.h \
+ signals_osdep.h caml/stack.h caml/spacetime.h caml/io.h caml/stack.h
 spacetime_byt_bd.$(O): spacetime_byt.c caml/fail.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/mlvalues.h
 spacetime_nat_bd.$(O): spacetime_nat.c caml/config.h caml/m.h caml/s.h \
-  caml/alloc.h caml/misc.h caml/mlvalues.h caml/backtrace_prim.h \
-  caml/backtrace.h caml/exec.h caml/fail.h caml/gc.h caml/intext.h \
-  caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
-  caml/minor_gc.h caml/address_class.h caml/osdeps.h caml/roots.h \
-  caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h
+ caml/alloc.h caml/misc.h caml/config.h caml/mlvalues.h \
+ caml/backtrace_prim.h caml/backtrace.h caml/exec.h caml/fail.h caml/gc.h \
+ caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h \
+ caml/roots.h caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h \
+ caml/stack.h
 spacetime_snapshot_bd.$(O): spacetime_snapshot.c caml/alloc.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/mlvalues.h caml/backtrace_prim.h \
-  caml/backtrace.h caml/exec.h caml/custom.h caml/fail.h caml/gc.h \
-  caml/gc_ctrl.h caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/minor_gc.h caml/address_class.h caml/roots.h \
-  caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h
+ caml/config.h caml/m.h caml/s.h caml/mlvalues.h caml/backtrace_prim.h \
+ caml/backtrace.h caml/exec.h caml/config.h caml/custom.h caml/fail.h \
+ caml/gc.h caml/gc_ctrl.h caml/intext.h caml/io.h caml/major_gc.h \
+ caml/freelist.h caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/memory.h caml/signals.h caml/stack.h caml/sys.h \
+ caml/spacetime.h caml/stack.h
 stacks_bd.$(O): stacks.c caml/config.h caml/m.h caml/s.h caml/fail.h \
-  caml/misc.h caml/mlvalues.h caml/stacks.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/misc.h caml/mlvalues.h \
+ caml/stacks.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 startup_aux_bd.$(O): startup_aux.c caml/backtrace.h caml/mlvalues.h \
-  caml/config.h caml/m.h caml/s.h caml/misc.h caml/exec.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/callback.h caml/dynlink.h caml/osdeps.h \
-  caml/startup_aux.h
+ caml/config.h caml/m.h caml/s.h caml/misc.h caml/exec.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/callback.h caml/major_gc.h caml/dynlink.h \
+ caml/osdeps.h caml/memory.h caml/startup_aux.h
 startup_byt_bd.$(O): startup_byt.c caml/config.h caml/m.h caml/s.h caml/alloc.h \
-  caml/misc.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
-  caml/callback.h caml/custom.h caml/debugger.h caml/dynlink.h \
-  caml/fail.h caml/fix_code.h caml/freelist.h caml/gc_ctrl.h \
-  caml/instrtrace.h caml/interp.h caml/intext.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
-  caml/osdeps.h caml/prims.h caml/printexc.h caml/reverse.h \
-  caml/signals.h caml/stacks.h caml/sys.h caml/startup.h \
-  caml/startup_aux.h caml/version.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
+ caml/callback.h caml/custom.h caml/debugger.h caml/dynlink.h caml/exec.h \
+ caml/fail.h caml/fix_code.h caml/freelist.h caml/gc_ctrl.h \
+ caml/instrtrace.h caml/interp.h caml/intext.h caml/io.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/osdeps.h caml/memory.h caml/prims.h caml/printexc.h caml/reverse.h \
+ caml/signals.h caml/stacks.h caml/sys.h caml/startup.h \
+ caml/startup_aux.h caml/version.h
 startup_nat_bd.$(O): startup_nat.c caml/callback.h caml/mlvalues.h \
-  caml/config.h caml/m.h caml/s.h caml/misc.h caml/backtrace.h \
-  caml/exec.h caml/custom.h caml/debugger.h caml/fail.h caml/freelist.h \
-  caml/gc.h caml/gc_ctrl.h caml/intext.h caml/io.h caml/memory.h \
-  caml/major_gc.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/printexc.h caml/stack.h caml/startup_aux.h caml/sys.h
+ caml/config.h caml/m.h caml/s.h caml/misc.h caml/backtrace.h caml/exec.h \
+ caml/custom.h caml/debugger.h caml/fail.h caml/freelist.h caml/gc.h \
+ caml/gc_ctrl.h caml/intext.h caml/io.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h caml/printexc.h \
+ caml/stack.h caml/startup_aux.h caml/sys.h
 str_bd.$(O): str.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/mlvalues.h \
+ caml/misc.h
 sys_bd.$(O): sys.c caml/config.h caml/m.h caml/s.h caml/alloc.h caml/misc.h \
-  caml/mlvalues.h caml/debugger.h caml/fail.h caml/gc_ctrl.h caml/io.h \
-  caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/signals.h caml/stacks.h \
-  caml/sys.h caml/version.h caml/callback.h caml/startup_aux.h
+ caml/config.h caml/mlvalues.h caml/debugger.h caml/fail.h caml/gc_ctrl.h \
+ caml/io.h caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/signals.h caml/stacks.h caml/sys.h \
+ caml/version.h caml/callback.h caml/startup_aux.h
 unix_bd.$(O): unix.c caml/config.h caml/m.h caml/s.h caml/fail.h caml/misc.h \
-  caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/signals.h caml/sys.h caml/io.h caml/alloc.h
+ caml/config.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/sys.h caml/io.h \
+ caml/alloc.h
 weak_bd.$(O): weak.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/weak.h caml/signals.h
-afl_bi.$(O): afl.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/mlvalues.h \
-  caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/fail.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/weak.h caml/minor_gc.h \
+ caml/signals.h
+win32_bd.$(O): win32.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
+ caml/mlvalues.h caml/address_class.h caml/fail.h caml/io.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/osdeps.h caml/memory.h \
+ caml/signals.h caml/sys.h caml/config.h
+afl_bi.$(O): afl.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/config.h \
+ caml/mlvalues.h caml/misc.h caml/osdeps.h caml/memory.h caml/gc.h \
+ caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 alloc_bi.$(O): alloc.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/custom.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/stacks.h
+ caml/mlvalues.h caml/custom.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/stacks.h caml/memory.h
 array_bi.$(O): array.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/signals.h \
-  caml/spacetime.h caml/io.h caml/stack.h
+ caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/mlvalues.h caml/signals.h caml/spacetime.h caml/io.h caml/stack.h
 backtrace_bi.$(O): backtrace.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/backtrace.h \
-  caml/exec.h caml/backtrace_prim.h caml/fail.h
+ caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/backtrace.h \
+ caml/exec.h caml/backtrace_prim.h caml/backtrace.h caml/fail.h
 backtrace_byt_bi.$(O): backtrace_byt.c caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/misc.h caml/alloc.h caml/custom.h caml/io.h \
-  caml/instruct.h caml/intext.h caml/exec.h caml/fix_code.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/startup.h caml/stacks.h \
-  caml/sys.h caml/backtrace.h caml/fail.h caml/backtrace_prim.h
+ caml/mlvalues.h caml/config.h caml/misc.h caml/alloc.h caml/mlvalues.h \
+ caml/custom.h caml/io.h caml/instruct.h caml/intext.h caml/io.h \
+ caml/exec.h caml/fix_code.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/startup.h \
+ caml/exec.h caml/stacks.h caml/memory.h caml/sys.h caml/backtrace.h \
+ caml/fail.h caml/backtrace_prim.h caml/backtrace.h
 backtrace_nat_bi.$(O): backtrace_nat.c caml/alloc.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
-  caml/backtrace_prim.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/stack.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
+ caml/backtrace_prim.h caml/backtrace.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/misc.h caml/mlvalues.h caml/stack.h
 bigarray_bi.$(O): bigarray.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/bigarray.h caml/custom.h caml/fail.h \
-  caml/intext.h caml/io.h caml/hash.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/signals.h
+ caml/s.h caml/mlvalues.h caml/bigarray.h caml/custom.h caml/fail.h \
+ caml/intext.h caml/io.h caml/hash.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/signals.h
 callback_bi.$(O): callback.c caml/callback.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/interp.h caml/instruct.h caml/fix_code.h caml/stacks.h
+ caml/m.h caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/interp.h caml/instruct.h caml/fix_code.h \
+ caml/stacks.h caml/memory.h
 clambda_checks_bi.$(O): clambda_checks.c caml/mlvalues.h caml/config.h caml/m.h \
-  caml/s.h caml/misc.h
+ caml/s.h caml/misc.h
 compact_bi.$(O): compact.c caml/address_class.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/finalise.h caml/roots.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/gc_ctrl.h caml/weak.h caml/compact.h
+ caml/misc.h caml/mlvalues.h caml/config.h caml/finalise.h caml/roots.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/freelist.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/mlvalues.h caml/roots.h caml/weak.h \
+ caml/compact.h
 compare_bi.$(O): compare.c caml/custom.h caml/mlvalues.h caml/config.h caml/m.h \
-  caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/mlvalues.h
 custom_bi.$(O): custom.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc_ctrl.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/signals.h
+ caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc_ctrl.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/signals.h
 debugger_bi.$(O): debugger.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/debugger.h caml/osdeps.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/fail.h caml/fix_code.h caml/instruct.h \
-  caml/intext.h caml/io.h caml/stacks.h caml/sys.h
+ caml/s.h caml/mlvalues.h caml/config.h caml/debugger.h caml/misc.h \
+ caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/fail.h caml/fix_code.h \
+ caml/instruct.h caml/intext.h caml/io.h caml/io.h caml/mlvalues.h \
+ caml/stacks.h caml/sys.h
 dynlink_bi.$(O): dynlink.c caml/config.h caml/m.h caml/s.h caml/alloc.h \
-  caml/misc.h caml/mlvalues.h caml/dynlink.h caml/fail.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/osdeps.h caml/prims.h caml/signals.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/dynlink.h caml/fail.h \
+ caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/misc.h caml/osdeps.h \
+ caml/memory.h caml/prims.h caml/signals.h
 dynlink_nat_bi.$(O): dynlink_nat.c caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/stack.h \
-  caml/callback.h caml/alloc.h caml/intext.h caml/io.h caml/osdeps.h \
-  caml/fail.h caml/signals.h caml/hooks.h
+ caml/mlvalues.h caml/misc.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/stack.h caml/callback.h caml/alloc.h caml/intext.h caml/io.h \
+ caml/osdeps.h caml/memory.h caml/fail.h caml/signals.h caml/hooks.h
 extern_bi.$(O): extern.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc.h \
-  caml/intext.h caml/io.h caml/md5.h caml/memory.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/reverse.h
+ caml/s.h caml/mlvalues.h caml/config.h caml/custom.h caml/fail.h \
+ caml/gc.h caml/intext.h caml/io.h caml/io.h caml/md5.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/reverse.h
 fail_byt_bi.$(O): fail_byt.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/printexc.h caml/signals.h caml/stacks.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/printexc.h \
+ caml/signals.h caml/stacks.h caml/memory.h
 fail_nat_bi.$(O): fail_nat.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/printexc.h caml/signals.h caml/stack.h caml/roots.h \
-  caml/callback.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/printexc.h caml/signals.h \
+ caml/stack.h caml/roots.h caml/memory.h caml/callback.h
 finalise_bi.$(O): finalise.c caml/callback.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/compact.h caml/fail.h \
-  caml/finalise.h caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/signals.h
+ caml/m.h caml/s.h caml/misc.h caml/compact.h caml/fail.h caml/finalise.h \
+ caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/minor_gc.h caml/mlvalues.h \
+ caml/roots.h caml/signals.h
 fix_code_bi.$(O): fix_code.c caml/config.h caml/m.h caml/s.h caml/debugger.h \
-  caml/misc.h caml/mlvalues.h caml/fix_code.h caml/instruct.h \
-  caml/intext.h caml/io.h caml/md5.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/fix_code.h \
+ caml/instruct.h caml/intext.h caml/io.h caml/md5.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/reverse.h
 floats_bi.$(O): floats.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h caml/stacks.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/misc.h caml/reverse.h caml/stacks.h caml/memory.h
 freelist_bi.$(O): freelist.c caml/config.h caml/m.h caml/s.h caml/freelist.h \
-  caml/misc.h caml/mlvalues.h caml/gc.h caml/gc_ctrl.h caml/memory.h \
-  caml/major_gc.h caml/minor_gc.h caml/address_class.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/gc.h caml/gc_ctrl.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/major_gc.h caml/misc.h caml/mlvalues.h
 gc_ctrl_bi.$(O): gc_ctrl.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/compact.h \
-  caml/custom.h caml/fail.h caml/finalise.h caml/roots.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/gc_ctrl.h caml/signals.h caml/stacks.h \
-  caml/startup_aux.h
+ caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/compact.h \
+ caml/custom.h caml/fail.h caml/finalise.h caml/roots.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/freelist.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/minor_gc.h caml/misc.h \
+ caml/mlvalues.h caml/signals.h caml/stacks.h caml/startup_aux.h
 globroots_bi.$(O): globroots.c caml/memory.h caml/config.h caml/m.h caml/s.h \
-  caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/roots.h caml/globroots.h
+ caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/memory.h caml/globroots.h caml/roots.h
 hash_bi.$(O): hash.c caml/mlvalues.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/custom.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/hash.h
+ caml/misc.h caml/custom.h caml/mlvalues.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/hash.h
 instrtrace_bi.$(O): instrtrace.c
 intern_bi.$(O): intern.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/callback.h caml/custom.h caml/fail.h \
-  caml/gc.h caml/intext.h caml/io.h caml/md5.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h
+ caml/s.h caml/mlvalues.h caml/callback.h caml/config.h caml/custom.h \
+ caml/fail.h caml/gc.h caml/intext.h caml/io.h caml/io.h caml/md5.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/misc.h caml/reverse.h
 interp_bi.$(O): interp.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/callback.h \
-  caml/debugger.h caml/fail.h caml/fix_code.h caml/instrtrace.h \
-  caml/instruct.h caml/interp.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/prims.h caml/signals.h caml/stacks.h caml/startup_aux.h \
-  caml/jumptbl.h
+ caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/callback.h \
+ caml/debugger.h caml/fail.h caml/fix_code.h caml/instrtrace.h \
+ caml/instruct.h caml/interp.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/prims.h \
+ caml/signals.h caml/stacks.h caml/memory.h caml/startup_aux.h \
+ caml/jumptbl.h
 ints_bi.$(O): ints.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/custom.h caml/fail.h caml/intext.h caml/io.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/custom.h caml/fail.h caml/intext.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h
 io_bi.$(O): io.c caml/config.h caml/m.h caml/s.h caml/alloc.h caml/misc.h \
-  caml/mlvalues.h caml/custom.h caml/fail.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/osdeps.h caml/signals.h caml/sys.h
+ caml/config.h caml/mlvalues.h caml/custom.h caml/fail.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/osdeps.h \
+ caml/memory.h caml/signals.h caml/sys.h
 lexing_bi.$(O): lexing.c caml/fail.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/stacks.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/s.h caml/mlvalues.h caml/mlvalues.h caml/stacks.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 main_bi.$(O): main.c caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/sys.h caml/osdeps.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/misc.h caml/sys.h caml/osdeps.h caml/memory.h \
+ caml/gc.h caml/mlvalues.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 major_gc_bi.$(O): major_gc.c caml/compact.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/custom.h caml/fail.h caml/finalise.h \
-  caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/gc_ctrl.h caml/signals.h \
-  caml/weak.h
+ caml/misc.h caml/mlvalues.h caml/custom.h caml/config.h caml/fail.h \
+ caml/finalise.h caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/freelist.h \
+ caml/gc.h caml/gc_ctrl.h caml/major_gc.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/signals.h caml/weak.h
 md5_bi.$(O): md5.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/md5.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/reverse.h
+ caml/mlvalues.h caml/fail.h caml/md5.h caml/io.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/io.h caml/reverse.h
 memory_bi.$(O): memory.c caml/address_class.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/fail.h caml/freelist.h caml/gc.h \
-  caml/gc_ctrl.h caml/major_gc.h caml/memory.h caml/minor_gc.h \
-  caml/signals.h
+ caml/misc.h caml/mlvalues.h caml/config.h caml/fail.h caml/freelist.h \
+ caml/gc.h caml/gc_ctrl.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/signals.h
 meta_bi.$(O): meta.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/fix_code.h caml/interp.h \
-  caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
-  caml/gc.h caml/minor_gc.h caml/address_class.h caml/prims.h \
-  caml/stacks.h caml/backtrace_prim.h caml/backtrace.h caml/exec.h
+ caml/mlvalues.h caml/config.h caml/fail.h caml/fix_code.h caml/interp.h \
+ caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/prims.h caml/stacks.h \
+ caml/memory.h caml/backtrace_prim.h caml/backtrace.h caml/exec.h
 minor_gc_bi.$(O): minor_gc.c caml/custom.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/fail.h caml/finalise.h caml/roots.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/gc_ctrl.h caml/signals.h \
-  caml/weak.h
-misc_bi.$(O): misc.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/memory.h \
-  caml/gc.h caml/mlvalues.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/osdeps.h caml/version.h
+ caml/m.h caml/s.h caml/misc.h caml/config.h caml/fail.h caml/finalise.h \
+ caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/minor_gc.h caml/misc.h \
+ caml/mlvalues.h caml/roots.h caml/signals.h caml/weak.h
+misc_bi.$(O): misc.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/config.h \
+ caml/memory.h caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
+ caml/memory.h caml/version.h
 obj_bi.$(O): obj.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/gc.h caml/interp.h caml/major_gc.h \
-  caml/freelist.h caml/memory.h caml/minor_gc.h caml/address_class.h \
-  caml/prims.h caml/spacetime.h caml/io.h caml/stack.h
+ caml/mlvalues.h caml/fail.h caml/gc.h caml/interp.h caml/major_gc.h \
+ caml/freelist.h caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/prims.h caml/spacetime.h caml/io.h caml/stack.h
 parsing_bi.$(O): parsing.c caml/config.h caml/m.h caml/s.h caml/mlvalues.h \
-  caml/misc.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/alloc.h
+ caml/config.h caml/misc.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/alloc.h
 prims_bi.$(O): prims.c caml/mlvalues.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/prims.h
+ caml/misc.h caml/prims.h
 printexc_bi.$(O): printexc.c caml/backtrace.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/exec.h caml/callback.h \
-  caml/debugger.h caml/fail.h caml/printexc.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/m.h caml/s.h caml/misc.h caml/exec.h caml/callback.h \
+ caml/debugger.h caml/fail.h caml/misc.h caml/mlvalues.h caml/printexc.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 roots_byt_bi.$(O): roots_byt.c caml/finalise.h caml/roots.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h \
-  caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/globroots.h caml/stacks.h
+ caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/globroots.h caml/major_gc.h caml/memory.h caml/minor_gc.h \
+ caml/misc.h caml/mlvalues.h caml/roots.h caml/stacks.h
 roots_nat_bi.$(O): roots_nat.c caml/finalise.h caml/roots.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h \
-  caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/globroots.h caml/stack.h
+ caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/globroots.h caml/memory.h caml/major_gc.h caml/minor_gc.h \
+ caml/misc.h caml/mlvalues.h caml/stack.h caml/roots.h
 signals_bi.$(O): signals.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/callback.h caml/fail.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/roots.h caml/signals.h \
-  caml/signals_machdep.h caml/sys.h
+ caml/s.h caml/mlvalues.h caml/callback.h caml/config.h caml/fail.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/roots.h \
+ caml/memory.h caml/signals.h caml/signals_machdep.h caml/sys.h
 signals_byt_bi.$(O): signals_byt.c caml/config.h caml/m.h caml/s.h \
-  caml/memory.h caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/signals.h caml/signals_machdep.h
+ caml/memory.h caml/config.h caml/gc.h caml/mlvalues.h caml/misc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/signals_machdep.h
 signals_nat_bi.$(O): signals_nat.c caml/fail.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/osdeps.h caml/signals.h caml/signals_machdep.h signals_osdep.h \
-  caml/stack.h caml/spacetime.h caml/io.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/signals_machdep.h \
+ signals_osdep.h caml/stack.h caml/spacetime.h caml/io.h caml/stack.h
 spacetime_byt_bi.$(O): spacetime_byt.c caml/fail.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/mlvalues.h
 spacetime_nat_bi.$(O): spacetime_nat.c caml/config.h caml/m.h caml/s.h \
-  caml/alloc.h caml/misc.h caml/mlvalues.h caml/backtrace_prim.h \
-  caml/backtrace.h caml/exec.h caml/fail.h caml/gc.h caml/intext.h \
-  caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
-  caml/minor_gc.h caml/address_class.h caml/osdeps.h caml/roots.h \
-  caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h
+ caml/alloc.h caml/misc.h caml/config.h caml/mlvalues.h \
+ caml/backtrace_prim.h caml/backtrace.h caml/exec.h caml/fail.h caml/gc.h \
+ caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h \
+ caml/roots.h caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h \
+ caml/stack.h
 spacetime_snapshot_bi.$(O): spacetime_snapshot.c caml/alloc.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/mlvalues.h caml/backtrace_prim.h \
-  caml/backtrace.h caml/exec.h caml/custom.h caml/fail.h caml/gc.h \
-  caml/gc_ctrl.h caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/minor_gc.h caml/address_class.h caml/roots.h \
-  caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h
+ caml/config.h caml/m.h caml/s.h caml/mlvalues.h caml/backtrace_prim.h \
+ caml/backtrace.h caml/exec.h caml/config.h caml/custom.h caml/fail.h \
+ caml/gc.h caml/gc_ctrl.h caml/intext.h caml/io.h caml/major_gc.h \
+ caml/freelist.h caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/memory.h caml/signals.h caml/stack.h caml/sys.h \
+ caml/spacetime.h caml/stack.h
 stacks_bi.$(O): stacks.c caml/config.h caml/m.h caml/s.h caml/fail.h \
-  caml/misc.h caml/mlvalues.h caml/stacks.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/misc.h caml/mlvalues.h \
+ caml/stacks.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 startup_aux_bi.$(O): startup_aux.c caml/backtrace.h caml/mlvalues.h \
-  caml/config.h caml/m.h caml/s.h caml/misc.h caml/exec.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/callback.h caml/dynlink.h caml/osdeps.h \
-  caml/startup_aux.h
+ caml/config.h caml/m.h caml/s.h caml/misc.h caml/exec.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/callback.h caml/major_gc.h caml/dynlink.h \
+ caml/osdeps.h caml/memory.h caml/startup_aux.h
 startup_byt_bi.$(O): startup_byt.c caml/config.h caml/m.h caml/s.h caml/alloc.h \
-  caml/misc.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
-  caml/callback.h caml/custom.h caml/debugger.h caml/dynlink.h \
-  caml/fail.h caml/fix_code.h caml/freelist.h caml/gc_ctrl.h \
-  caml/instrtrace.h caml/interp.h caml/intext.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
-  caml/osdeps.h caml/prims.h caml/printexc.h caml/reverse.h \
-  caml/signals.h caml/stacks.h caml/sys.h caml/startup.h \
-  caml/startup_aux.h caml/version.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
+ caml/callback.h caml/custom.h caml/debugger.h caml/dynlink.h caml/exec.h \
+ caml/fail.h caml/fix_code.h caml/freelist.h caml/gc_ctrl.h \
+ caml/instrtrace.h caml/interp.h caml/intext.h caml/io.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/osdeps.h caml/memory.h caml/prims.h caml/printexc.h caml/reverse.h \
+ caml/signals.h caml/stacks.h caml/sys.h caml/startup.h \
+ caml/startup_aux.h caml/version.h
 startup_nat_bi.$(O): startup_nat.c caml/callback.h caml/mlvalues.h \
-  caml/config.h caml/m.h caml/s.h caml/misc.h caml/backtrace.h \
-  caml/exec.h caml/custom.h caml/debugger.h caml/fail.h caml/freelist.h \
-  caml/gc.h caml/gc_ctrl.h caml/intext.h caml/io.h caml/memory.h \
-  caml/major_gc.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/printexc.h caml/stack.h caml/startup_aux.h caml/sys.h
+ caml/config.h caml/m.h caml/s.h caml/misc.h caml/backtrace.h caml/exec.h \
+ caml/custom.h caml/debugger.h caml/fail.h caml/freelist.h caml/gc.h \
+ caml/gc_ctrl.h caml/intext.h caml/io.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h caml/printexc.h \
+ caml/stack.h caml/startup_aux.h caml/sys.h
 str_bi.$(O): str.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/mlvalues.h \
+ caml/misc.h
 sys_bi.$(O): sys.c caml/config.h caml/m.h caml/s.h caml/alloc.h caml/misc.h \
-  caml/mlvalues.h caml/debugger.h caml/fail.h caml/gc_ctrl.h caml/io.h \
-  caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/signals.h caml/stacks.h \
-  caml/sys.h caml/version.h caml/callback.h caml/startup_aux.h
+ caml/config.h caml/mlvalues.h caml/debugger.h caml/fail.h caml/gc_ctrl.h \
+ caml/io.h caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/signals.h caml/stacks.h caml/sys.h \
+ caml/version.h caml/callback.h caml/startup_aux.h
 unix_bi.$(O): unix.c caml/config.h caml/m.h caml/s.h caml/fail.h caml/misc.h \
-  caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/signals.h caml/sys.h caml/io.h caml/alloc.h
+ caml/config.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/sys.h caml/io.h \
+ caml/alloc.h
 weak_bi.$(O): weak.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/weak.h caml/signals.h
-afl_bpic.$(O): afl.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/mlvalues.h \
-  caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/fail.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/weak.h caml/minor_gc.h \
+ caml/signals.h
+win32_bi.$(O): win32.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
+ caml/mlvalues.h caml/address_class.h caml/fail.h caml/io.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/osdeps.h caml/memory.h \
+ caml/signals.h caml/sys.h caml/config.h
+afl_bpic.$(O): afl.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/config.h \
+ caml/mlvalues.h caml/misc.h caml/osdeps.h caml/memory.h caml/gc.h \
+ caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 alloc_bpic.$(O): alloc.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/custom.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/stacks.h
+ caml/mlvalues.h caml/custom.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/stacks.h caml/memory.h
 array_bpic.$(O): array.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/signals.h \
-  caml/spacetime.h caml/io.h caml/stack.h
+ caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/mlvalues.h caml/signals.h caml/spacetime.h caml/io.h caml/stack.h
 backtrace_bpic.$(O): backtrace.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/backtrace.h \
-  caml/exec.h caml/backtrace_prim.h caml/fail.h
+ caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/backtrace.h \
+ caml/exec.h caml/backtrace_prim.h caml/backtrace.h caml/fail.h
 backtrace_byt_bpic.$(O): backtrace_byt.c caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/misc.h caml/alloc.h caml/custom.h caml/io.h \
-  caml/instruct.h caml/intext.h caml/exec.h caml/fix_code.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/startup.h caml/stacks.h \
-  caml/sys.h caml/backtrace.h caml/fail.h caml/backtrace_prim.h
+ caml/mlvalues.h caml/config.h caml/misc.h caml/alloc.h caml/mlvalues.h \
+ caml/custom.h caml/io.h caml/instruct.h caml/intext.h caml/io.h \
+ caml/exec.h caml/fix_code.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/startup.h \
+ caml/exec.h caml/stacks.h caml/memory.h caml/sys.h caml/backtrace.h \
+ caml/fail.h caml/backtrace_prim.h caml/backtrace.h
 backtrace_nat_bpic.$(O): backtrace_nat.c caml/alloc.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
-  caml/backtrace_prim.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/stack.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
+ caml/backtrace_prim.h caml/backtrace.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/misc.h caml/mlvalues.h caml/stack.h
 bigarray_bpic.$(O): bigarray.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/bigarray.h caml/custom.h caml/fail.h \
-  caml/intext.h caml/io.h caml/hash.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/signals.h
+ caml/s.h caml/mlvalues.h caml/bigarray.h caml/custom.h caml/fail.h \
+ caml/intext.h caml/io.h caml/hash.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/signals.h
 callback_bpic.$(O): callback.c caml/callback.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/interp.h caml/instruct.h caml/fix_code.h caml/stacks.h
+ caml/m.h caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/interp.h caml/instruct.h caml/fix_code.h \
+ caml/stacks.h caml/memory.h
 clambda_checks_bpic.$(O): clambda_checks.c caml/mlvalues.h caml/config.h caml/m.h \
-  caml/s.h caml/misc.h
+ caml/s.h caml/misc.h
 compact_bpic.$(O): compact.c caml/address_class.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/finalise.h caml/roots.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/gc_ctrl.h caml/weak.h caml/compact.h
+ caml/misc.h caml/mlvalues.h caml/config.h caml/finalise.h caml/roots.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/freelist.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/mlvalues.h caml/roots.h caml/weak.h \
+ caml/compact.h
 compare_bpic.$(O): compare.c caml/custom.h caml/mlvalues.h caml/config.h caml/m.h \
-  caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/mlvalues.h
 custom_bpic.$(O): custom.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc_ctrl.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/signals.h
+ caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc_ctrl.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/signals.h
 debugger_bpic.$(O): debugger.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/debugger.h caml/osdeps.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/fail.h caml/fix_code.h caml/instruct.h \
-  caml/intext.h caml/io.h caml/stacks.h caml/sys.h
+ caml/s.h caml/mlvalues.h caml/config.h caml/debugger.h caml/misc.h \
+ caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/fail.h caml/fix_code.h \
+ caml/instruct.h caml/intext.h caml/io.h caml/io.h caml/mlvalues.h \
+ caml/stacks.h caml/sys.h
 dynlink_bpic.$(O): dynlink.c caml/config.h caml/m.h caml/s.h caml/alloc.h \
-  caml/misc.h caml/mlvalues.h caml/dynlink.h caml/fail.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/osdeps.h caml/prims.h caml/signals.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/dynlink.h caml/fail.h \
+ caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/misc.h caml/osdeps.h \
+ caml/memory.h caml/prims.h caml/signals.h
 dynlink_nat_bpic.$(O): dynlink_nat.c caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/stack.h \
-  caml/callback.h caml/alloc.h caml/intext.h caml/io.h caml/osdeps.h \
-  caml/fail.h caml/signals.h caml/hooks.h
+ caml/mlvalues.h caml/misc.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/stack.h caml/callback.h caml/alloc.h caml/intext.h caml/io.h \
+ caml/osdeps.h caml/memory.h caml/fail.h caml/signals.h caml/hooks.h
 extern_bpic.$(O): extern.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc.h \
-  caml/intext.h caml/io.h caml/md5.h caml/memory.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/reverse.h
+ caml/s.h caml/mlvalues.h caml/config.h caml/custom.h caml/fail.h \
+ caml/gc.h caml/intext.h caml/io.h caml/io.h caml/md5.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/reverse.h
 fail_byt_bpic.$(O): fail_byt.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/printexc.h caml/signals.h caml/stacks.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/printexc.h \
+ caml/signals.h caml/stacks.h caml/memory.h
 fail_nat_bpic.$(O): fail_nat.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/printexc.h caml/signals.h caml/stack.h caml/roots.h \
-  caml/callback.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/printexc.h caml/signals.h \
+ caml/stack.h caml/roots.h caml/memory.h caml/callback.h
 finalise_bpic.$(O): finalise.c caml/callback.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/compact.h caml/fail.h \
-  caml/finalise.h caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/signals.h
+ caml/m.h caml/s.h caml/misc.h caml/compact.h caml/fail.h caml/finalise.h \
+ caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/minor_gc.h caml/mlvalues.h \
+ caml/roots.h caml/signals.h
 fix_code_bpic.$(O): fix_code.c caml/config.h caml/m.h caml/s.h caml/debugger.h \
-  caml/misc.h caml/mlvalues.h caml/fix_code.h caml/instruct.h \
-  caml/intext.h caml/io.h caml/md5.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/fix_code.h \
+ caml/instruct.h caml/intext.h caml/io.h caml/md5.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/reverse.h
 floats_bpic.$(O): floats.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h caml/stacks.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/misc.h caml/reverse.h caml/stacks.h caml/memory.h
 freelist_bpic.$(O): freelist.c caml/config.h caml/m.h caml/s.h caml/freelist.h \
-  caml/misc.h caml/mlvalues.h caml/gc.h caml/gc_ctrl.h caml/memory.h \
-  caml/major_gc.h caml/minor_gc.h caml/address_class.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/gc.h caml/gc_ctrl.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/major_gc.h caml/misc.h caml/mlvalues.h
 gc_ctrl_bpic.$(O): gc_ctrl.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/compact.h \
-  caml/custom.h caml/fail.h caml/finalise.h caml/roots.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/gc_ctrl.h caml/signals.h caml/stacks.h \
-  caml/startup_aux.h
+ caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/compact.h \
+ caml/custom.h caml/fail.h caml/finalise.h caml/roots.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/freelist.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/minor_gc.h caml/misc.h \
+ caml/mlvalues.h caml/signals.h caml/stacks.h caml/startup_aux.h
 globroots_bpic.$(O): globroots.c caml/memory.h caml/config.h caml/m.h caml/s.h \
-  caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/roots.h caml/globroots.h
+ caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/memory.h caml/globroots.h caml/roots.h
 hash_bpic.$(O): hash.c caml/mlvalues.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/custom.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/hash.h
+ caml/misc.h caml/custom.h caml/mlvalues.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/hash.h
 instrtrace_bpic.$(O): instrtrace.c
 intern_bpic.$(O): intern.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/callback.h caml/custom.h caml/fail.h \
-  caml/gc.h caml/intext.h caml/io.h caml/md5.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h
+ caml/s.h caml/mlvalues.h caml/callback.h caml/config.h caml/custom.h \
+ caml/fail.h caml/gc.h caml/intext.h caml/io.h caml/io.h caml/md5.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/misc.h caml/reverse.h
 interp_bpic.$(O): interp.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/callback.h \
-  caml/debugger.h caml/fail.h caml/fix_code.h caml/instrtrace.h \
-  caml/instruct.h caml/interp.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/prims.h caml/signals.h caml/stacks.h caml/startup_aux.h \
-  caml/jumptbl.h
+ caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/callback.h \
+ caml/debugger.h caml/fail.h caml/fix_code.h caml/instrtrace.h \
+ caml/instruct.h caml/interp.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/prims.h \
+ caml/signals.h caml/stacks.h caml/memory.h caml/startup_aux.h \
+ caml/jumptbl.h
 ints_bpic.$(O): ints.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/custom.h caml/fail.h caml/intext.h caml/io.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/custom.h caml/fail.h caml/intext.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h
 io_bpic.$(O): io.c caml/config.h caml/m.h caml/s.h caml/alloc.h caml/misc.h \
-  caml/mlvalues.h caml/custom.h caml/fail.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/osdeps.h caml/signals.h caml/sys.h
+ caml/config.h caml/mlvalues.h caml/custom.h caml/fail.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/osdeps.h \
+ caml/memory.h caml/signals.h caml/sys.h
 lexing_bpic.$(O): lexing.c caml/fail.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/stacks.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/s.h caml/mlvalues.h caml/mlvalues.h caml/stacks.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 main_bpic.$(O): main.c caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/sys.h caml/osdeps.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/misc.h caml/sys.h caml/osdeps.h caml/memory.h \
+ caml/gc.h caml/mlvalues.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 major_gc_bpic.$(O): major_gc.c caml/compact.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/custom.h caml/fail.h caml/finalise.h \
-  caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/gc_ctrl.h caml/signals.h \
-  caml/weak.h
+ caml/misc.h caml/mlvalues.h caml/custom.h caml/config.h caml/fail.h \
+ caml/finalise.h caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/freelist.h \
+ caml/gc.h caml/gc_ctrl.h caml/major_gc.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/signals.h caml/weak.h
 md5_bpic.$(O): md5.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/md5.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/reverse.h
+ caml/mlvalues.h caml/fail.h caml/md5.h caml/io.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/io.h caml/reverse.h
 memory_bpic.$(O): memory.c caml/address_class.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/fail.h caml/freelist.h caml/gc.h \
-  caml/gc_ctrl.h caml/major_gc.h caml/memory.h caml/minor_gc.h \
-  caml/signals.h
+ caml/misc.h caml/mlvalues.h caml/config.h caml/fail.h caml/freelist.h \
+ caml/gc.h caml/gc_ctrl.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/signals.h
 meta_bpic.$(O): meta.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/fix_code.h caml/interp.h \
-  caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
-  caml/gc.h caml/minor_gc.h caml/address_class.h caml/prims.h \
-  caml/stacks.h caml/backtrace_prim.h caml/backtrace.h caml/exec.h
+ caml/mlvalues.h caml/config.h caml/fail.h caml/fix_code.h caml/interp.h \
+ caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/prims.h caml/stacks.h \
+ caml/memory.h caml/backtrace_prim.h caml/backtrace.h caml/exec.h
 minor_gc_bpic.$(O): minor_gc.c caml/custom.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/fail.h caml/finalise.h caml/roots.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/gc_ctrl.h caml/signals.h \
-  caml/weak.h
-misc_bpic.$(O): misc.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/memory.h \
-  caml/gc.h caml/mlvalues.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/osdeps.h caml/version.h
+ caml/m.h caml/s.h caml/misc.h caml/config.h caml/fail.h caml/finalise.h \
+ caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/minor_gc.h caml/misc.h \
+ caml/mlvalues.h caml/roots.h caml/signals.h caml/weak.h
+misc_bpic.$(O): misc.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/config.h \
+ caml/memory.h caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
+ caml/memory.h caml/version.h
 obj_bpic.$(O): obj.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/gc.h caml/interp.h caml/major_gc.h \
-  caml/freelist.h caml/memory.h caml/minor_gc.h caml/address_class.h \
-  caml/prims.h caml/spacetime.h caml/io.h caml/stack.h
+ caml/mlvalues.h caml/fail.h caml/gc.h caml/interp.h caml/major_gc.h \
+ caml/freelist.h caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/prims.h caml/spacetime.h caml/io.h caml/stack.h
 parsing_bpic.$(O): parsing.c caml/config.h caml/m.h caml/s.h caml/mlvalues.h \
-  caml/misc.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/alloc.h
+ caml/config.h caml/misc.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/alloc.h
 prims_bpic.$(O): prims.c caml/mlvalues.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/prims.h
+ caml/misc.h caml/prims.h
 printexc_bpic.$(O): printexc.c caml/backtrace.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/exec.h caml/callback.h \
-  caml/debugger.h caml/fail.h caml/printexc.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/m.h caml/s.h caml/misc.h caml/exec.h caml/callback.h \
+ caml/debugger.h caml/fail.h caml/misc.h caml/mlvalues.h caml/printexc.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 roots_byt_bpic.$(O): roots_byt.c caml/finalise.h caml/roots.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h \
-  caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/globroots.h caml/stacks.h
+ caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/globroots.h caml/major_gc.h caml/memory.h caml/minor_gc.h \
+ caml/misc.h caml/mlvalues.h caml/roots.h caml/stacks.h
 roots_nat_bpic.$(O): roots_nat.c caml/finalise.h caml/roots.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h \
-  caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/globroots.h caml/stack.h
+ caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/globroots.h caml/memory.h caml/major_gc.h caml/minor_gc.h \
+ caml/misc.h caml/mlvalues.h caml/stack.h caml/roots.h
 signals_bpic.$(O): signals.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/callback.h caml/fail.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/roots.h caml/signals.h \
-  caml/signals_machdep.h caml/sys.h
+ caml/s.h caml/mlvalues.h caml/callback.h caml/config.h caml/fail.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/roots.h \
+ caml/memory.h caml/signals.h caml/signals_machdep.h caml/sys.h
 signals_byt_bpic.$(O): signals_byt.c caml/config.h caml/m.h caml/s.h \
-  caml/memory.h caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/signals.h caml/signals_machdep.h
+ caml/memory.h caml/config.h caml/gc.h caml/mlvalues.h caml/misc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/signals_machdep.h
 signals_nat_bpic.$(O): signals_nat.c caml/fail.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/osdeps.h caml/signals.h caml/signals_machdep.h signals_osdep.h \
-  caml/stack.h caml/spacetime.h caml/io.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/signals_machdep.h \
+ signals_osdep.h caml/stack.h caml/spacetime.h caml/io.h caml/stack.h
 spacetime_byt_bpic.$(O): spacetime_byt.c caml/fail.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/mlvalues.h
 spacetime_nat_bpic.$(O): spacetime_nat.c caml/config.h caml/m.h caml/s.h \
-  caml/alloc.h caml/misc.h caml/mlvalues.h caml/backtrace_prim.h \
-  caml/backtrace.h caml/exec.h caml/fail.h caml/gc.h caml/intext.h \
-  caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
-  caml/minor_gc.h caml/address_class.h caml/osdeps.h caml/roots.h \
-  caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h
+ caml/alloc.h caml/misc.h caml/config.h caml/mlvalues.h \
+ caml/backtrace_prim.h caml/backtrace.h caml/exec.h caml/fail.h caml/gc.h \
+ caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h \
+ caml/roots.h caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h \
+ caml/stack.h
 spacetime_snapshot_bpic.$(O): spacetime_snapshot.c caml/alloc.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/mlvalues.h caml/backtrace_prim.h \
-  caml/backtrace.h caml/exec.h caml/custom.h caml/fail.h caml/gc.h \
-  caml/gc_ctrl.h caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/minor_gc.h caml/address_class.h caml/roots.h \
-  caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h
+ caml/config.h caml/m.h caml/s.h caml/mlvalues.h caml/backtrace_prim.h \
+ caml/backtrace.h caml/exec.h caml/config.h caml/custom.h caml/fail.h \
+ caml/gc.h caml/gc_ctrl.h caml/intext.h caml/io.h caml/major_gc.h \
+ caml/freelist.h caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/memory.h caml/signals.h caml/stack.h caml/sys.h \
+ caml/spacetime.h caml/stack.h
 stacks_bpic.$(O): stacks.c caml/config.h caml/m.h caml/s.h caml/fail.h \
-  caml/misc.h caml/mlvalues.h caml/stacks.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/misc.h caml/mlvalues.h \
+ caml/stacks.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 startup_aux_bpic.$(O): startup_aux.c caml/backtrace.h caml/mlvalues.h \
-  caml/config.h caml/m.h caml/s.h caml/misc.h caml/exec.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/callback.h caml/dynlink.h caml/osdeps.h \
-  caml/startup_aux.h
+ caml/config.h caml/m.h caml/s.h caml/misc.h caml/exec.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/callback.h caml/major_gc.h caml/dynlink.h \
+ caml/osdeps.h caml/memory.h caml/startup_aux.h
 startup_byt_bpic.$(O): startup_byt.c caml/config.h caml/m.h caml/s.h caml/alloc.h \
-  caml/misc.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
-  caml/callback.h caml/custom.h caml/debugger.h caml/dynlink.h \
-  caml/fail.h caml/fix_code.h caml/freelist.h caml/gc_ctrl.h \
-  caml/instrtrace.h caml/interp.h caml/intext.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
-  caml/osdeps.h caml/prims.h caml/printexc.h caml/reverse.h \
-  caml/signals.h caml/stacks.h caml/sys.h caml/startup.h \
-  caml/startup_aux.h caml/version.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
+ caml/callback.h caml/custom.h caml/debugger.h caml/dynlink.h caml/exec.h \
+ caml/fail.h caml/fix_code.h caml/freelist.h caml/gc_ctrl.h \
+ caml/instrtrace.h caml/interp.h caml/intext.h caml/io.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/osdeps.h caml/memory.h caml/prims.h caml/printexc.h caml/reverse.h \
+ caml/signals.h caml/stacks.h caml/sys.h caml/startup.h \
+ caml/startup_aux.h caml/version.h
 startup_nat_bpic.$(O): startup_nat.c caml/callback.h caml/mlvalues.h \
-  caml/config.h caml/m.h caml/s.h caml/misc.h caml/backtrace.h \
-  caml/exec.h caml/custom.h caml/debugger.h caml/fail.h caml/freelist.h \
-  caml/gc.h caml/gc_ctrl.h caml/intext.h caml/io.h caml/memory.h \
-  caml/major_gc.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/printexc.h caml/stack.h caml/startup_aux.h caml/sys.h
+ caml/config.h caml/m.h caml/s.h caml/misc.h caml/backtrace.h caml/exec.h \
+ caml/custom.h caml/debugger.h caml/fail.h caml/freelist.h caml/gc.h \
+ caml/gc_ctrl.h caml/intext.h caml/io.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h caml/printexc.h \
+ caml/stack.h caml/startup_aux.h caml/sys.h
 str_bpic.$(O): str.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/mlvalues.h \
+ caml/misc.h
 sys_bpic.$(O): sys.c caml/config.h caml/m.h caml/s.h caml/alloc.h caml/misc.h \
-  caml/mlvalues.h caml/debugger.h caml/fail.h caml/gc_ctrl.h caml/io.h \
-  caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/signals.h caml/stacks.h \
-  caml/sys.h caml/version.h caml/callback.h caml/startup_aux.h
+ caml/config.h caml/mlvalues.h caml/debugger.h caml/fail.h caml/gc_ctrl.h \
+ caml/io.h caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/signals.h caml/stacks.h caml/sys.h \
+ caml/version.h caml/callback.h caml/startup_aux.h
 unix_bpic.$(O): unix.c caml/config.h caml/m.h caml/s.h caml/fail.h caml/misc.h \
-  caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/signals.h caml/sys.h caml/io.h caml/alloc.h
+ caml/config.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/sys.h caml/io.h \
+ caml/alloc.h
 weak_bpic.$(O): weak.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/weak.h caml/signals.h
-afl_n.$(O): afl.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/mlvalues.h \
-  caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/fail.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/weak.h caml/minor_gc.h \
+ caml/signals.h
+win32_bpic.$(O): win32.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
+ caml/mlvalues.h caml/address_class.h caml/fail.h caml/io.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/osdeps.h caml/memory.h \
+ caml/signals.h caml/sys.h caml/config.h
+afl_n.$(O): afl.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/config.h \
+ caml/mlvalues.h caml/misc.h caml/osdeps.h caml/memory.h caml/gc.h \
+ caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 alloc_n.$(O): alloc.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/custom.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/stacks.h
+ caml/mlvalues.h caml/custom.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/stacks.h caml/memory.h
 array_n.$(O): array.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/signals.h \
-  caml/spacetime.h caml/io.h caml/stack.h
+ caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/mlvalues.h caml/signals.h caml/spacetime.h caml/io.h caml/stack.h
 backtrace_n.$(O): backtrace.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/backtrace.h \
-  caml/exec.h caml/backtrace_prim.h caml/fail.h
+ caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/backtrace.h \
+ caml/exec.h caml/backtrace_prim.h caml/backtrace.h caml/fail.h
 backtrace_byt_n.$(O): backtrace_byt.c caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/misc.h caml/alloc.h caml/custom.h caml/io.h \
-  caml/instruct.h caml/intext.h caml/exec.h caml/fix_code.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/startup.h caml/stacks.h \
-  caml/sys.h caml/backtrace.h caml/fail.h caml/backtrace_prim.h
+ caml/mlvalues.h caml/config.h caml/misc.h caml/alloc.h caml/mlvalues.h \
+ caml/custom.h caml/io.h caml/instruct.h caml/intext.h caml/io.h \
+ caml/exec.h caml/fix_code.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/startup.h \
+ caml/exec.h caml/stacks.h caml/memory.h caml/sys.h caml/backtrace.h \
+ caml/fail.h caml/backtrace_prim.h caml/backtrace.h
 backtrace_nat_n.$(O): backtrace_nat.c caml/alloc.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
-  caml/backtrace_prim.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/stack.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
+ caml/backtrace_prim.h caml/backtrace.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/misc.h caml/mlvalues.h caml/stack.h
 bigarray_n.$(O): bigarray.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/bigarray.h caml/custom.h caml/fail.h \
-  caml/intext.h caml/io.h caml/hash.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/signals.h
+ caml/s.h caml/mlvalues.h caml/bigarray.h caml/custom.h caml/fail.h \
+ caml/intext.h caml/io.h caml/hash.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/signals.h
 callback_n.$(O): callback.c caml/callback.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/m.h caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h
 clambda_checks_n.$(O): clambda_checks.c caml/mlvalues.h caml/config.h caml/m.h \
-  caml/s.h caml/misc.h
+ caml/s.h caml/misc.h
 compact_n.$(O): compact.c caml/address_class.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/finalise.h caml/roots.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/gc_ctrl.h caml/weak.h caml/compact.h
+ caml/misc.h caml/mlvalues.h caml/config.h caml/finalise.h caml/roots.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/freelist.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/mlvalues.h caml/roots.h caml/weak.h \
+ caml/compact.h
 compare_n.$(O): compare.c caml/custom.h caml/mlvalues.h caml/config.h caml/m.h \
-  caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/mlvalues.h
 custom_n.$(O): custom.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc_ctrl.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/signals.h
+ caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc_ctrl.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/signals.h
 debugger_n.$(O): debugger.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/debugger.h caml/osdeps.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h
+ caml/s.h caml/mlvalues.h caml/config.h caml/debugger.h caml/misc.h \
+ caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 dynlink_n.$(O): dynlink.c caml/config.h caml/m.h caml/s.h caml/alloc.h \
-  caml/misc.h caml/mlvalues.h caml/dynlink.h caml/fail.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/osdeps.h caml/prims.h caml/signals.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/dynlink.h caml/fail.h \
+ caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/misc.h caml/osdeps.h \
+ caml/memory.h caml/prims.h caml/signals.h
 dynlink_nat_n.$(O): dynlink_nat.c caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/stack.h \
-  caml/callback.h caml/alloc.h caml/intext.h caml/io.h caml/osdeps.h \
-  caml/fail.h caml/signals.h caml/hooks.h
+ caml/mlvalues.h caml/misc.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/stack.h caml/callback.h caml/alloc.h caml/intext.h caml/io.h \
+ caml/osdeps.h caml/memory.h caml/fail.h caml/signals.h caml/hooks.h
 extern_n.$(O): extern.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc.h \
-  caml/intext.h caml/io.h caml/md5.h caml/memory.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/reverse.h
+ caml/s.h caml/mlvalues.h caml/config.h caml/custom.h caml/fail.h \
+ caml/gc.h caml/intext.h caml/io.h caml/io.h caml/md5.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/reverse.h
 fail_byt_n.$(O): fail_byt.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/printexc.h caml/signals.h caml/stacks.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/printexc.h \
+ caml/signals.h caml/stacks.h caml/memory.h
 fail_nat_n.$(O): fail_nat.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/printexc.h caml/signals.h caml/stack.h caml/roots.h \
-  caml/callback.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/printexc.h caml/signals.h \
+ caml/stack.h caml/roots.h caml/memory.h caml/callback.h
 finalise_n.$(O): finalise.c caml/callback.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/compact.h caml/fail.h \
-  caml/finalise.h caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/signals.h
+ caml/m.h caml/s.h caml/misc.h caml/compact.h caml/fail.h caml/finalise.h \
+ caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/minor_gc.h caml/mlvalues.h \
+ caml/roots.h caml/signals.h
 fix_code_n.$(O): fix_code.c caml/config.h caml/m.h caml/s.h caml/debugger.h \
-  caml/misc.h caml/mlvalues.h caml/fix_code.h caml/instruct.h \
-  caml/intext.h caml/io.h caml/md5.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/fix_code.h \
+ caml/instruct.h caml/intext.h caml/io.h caml/md5.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/reverse.h
 floats_n.$(O): floats.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h caml/stacks.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/misc.h caml/reverse.h caml/stacks.h caml/memory.h
 freelist_n.$(O): freelist.c caml/config.h caml/m.h caml/s.h caml/freelist.h \
-  caml/misc.h caml/mlvalues.h caml/gc.h caml/gc_ctrl.h caml/memory.h \
-  caml/major_gc.h caml/minor_gc.h caml/address_class.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/gc.h caml/gc_ctrl.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/major_gc.h caml/misc.h caml/mlvalues.h
 gc_ctrl_n.$(O): gc_ctrl.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/compact.h \
-  caml/custom.h caml/fail.h caml/finalise.h caml/roots.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/gc_ctrl.h caml/signals.h caml/stack.h \
-  caml/startup_aux.h
+ caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/compact.h \
+ caml/custom.h caml/fail.h caml/finalise.h caml/roots.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/freelist.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/minor_gc.h caml/misc.h \
+ caml/mlvalues.h caml/signals.h caml/stack.h caml/startup_aux.h
 globroots_n.$(O): globroots.c caml/memory.h caml/config.h caml/m.h caml/s.h \
-  caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/roots.h caml/globroots.h
+ caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/memory.h caml/globroots.h caml/roots.h
 hash_n.$(O): hash.c caml/mlvalues.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/custom.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/hash.h
+ caml/misc.h caml/custom.h caml/mlvalues.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/hash.h
 instrtrace_n.$(O): instrtrace.c
 intern_n.$(O): intern.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/callback.h caml/custom.h caml/fail.h \
-  caml/gc.h caml/intext.h caml/io.h caml/md5.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h
+ caml/s.h caml/mlvalues.h caml/callback.h caml/config.h caml/custom.h \
+ caml/fail.h caml/gc.h caml/intext.h caml/io.h caml/io.h caml/md5.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/misc.h caml/reverse.h
 interp_n.$(O): interp.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/callback.h \
-  caml/debugger.h caml/fail.h caml/fix_code.h caml/instrtrace.h \
-  caml/instruct.h caml/interp.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/prims.h caml/signals.h caml/stacks.h caml/startup_aux.h \
-  caml/jumptbl.h
+ caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/callback.h \
+ caml/debugger.h caml/fail.h caml/fix_code.h caml/instrtrace.h \
+ caml/instruct.h caml/interp.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/prims.h \
+ caml/signals.h caml/stacks.h caml/memory.h caml/startup_aux.h \
+ caml/jumptbl.h
 ints_n.$(O): ints.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/custom.h caml/fail.h caml/intext.h caml/io.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/custom.h caml/fail.h caml/intext.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h
 io_n.$(O): io.c caml/config.h caml/m.h caml/s.h caml/alloc.h caml/misc.h \
-  caml/mlvalues.h caml/custom.h caml/fail.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/osdeps.h caml/signals.h caml/sys.h
+ caml/config.h caml/mlvalues.h caml/custom.h caml/fail.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/osdeps.h \
+ caml/memory.h caml/signals.h caml/sys.h
 lexing_n.$(O): lexing.c caml/fail.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/stacks.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/s.h caml/mlvalues.h caml/mlvalues.h caml/stacks.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 main_n.$(O): main.c caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/sys.h caml/osdeps.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/misc.h caml/sys.h caml/osdeps.h caml/memory.h \
+ caml/gc.h caml/mlvalues.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 major_gc_n.$(O): major_gc.c caml/compact.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/custom.h caml/fail.h caml/finalise.h \
-  caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/gc_ctrl.h caml/signals.h \
-  caml/weak.h
+ caml/misc.h caml/mlvalues.h caml/custom.h caml/config.h caml/fail.h \
+ caml/finalise.h caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/freelist.h \
+ caml/gc.h caml/gc_ctrl.h caml/major_gc.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/signals.h caml/weak.h
 md5_n.$(O): md5.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/md5.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/reverse.h
+ caml/mlvalues.h caml/fail.h caml/md5.h caml/io.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/io.h caml/reverse.h
 memory_n.$(O): memory.c caml/address_class.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/fail.h caml/freelist.h caml/gc.h \
-  caml/gc_ctrl.h caml/major_gc.h caml/memory.h caml/minor_gc.h \
-  caml/signals.h
+ caml/misc.h caml/mlvalues.h caml/config.h caml/fail.h caml/freelist.h \
+ caml/gc.h caml/gc_ctrl.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/signals.h
 meta_n.$(O): meta.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/fix_code.h caml/interp.h \
-  caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
-  caml/gc.h caml/minor_gc.h caml/address_class.h caml/prims.h \
-  caml/stacks.h caml/backtrace_prim.h caml/backtrace.h caml/exec.h
+ caml/mlvalues.h caml/config.h caml/fail.h caml/fix_code.h caml/interp.h \
+ caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/prims.h caml/stacks.h \
+ caml/memory.h caml/backtrace_prim.h caml/backtrace.h caml/exec.h
 minor_gc_n.$(O): minor_gc.c caml/custom.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/fail.h caml/finalise.h caml/roots.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/gc_ctrl.h caml/signals.h \
-  caml/weak.h
-misc_n.$(O): misc.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/memory.h \
-  caml/gc.h caml/mlvalues.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/osdeps.h caml/version.h
+ caml/m.h caml/s.h caml/misc.h caml/config.h caml/fail.h caml/finalise.h \
+ caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/minor_gc.h caml/misc.h \
+ caml/mlvalues.h caml/roots.h caml/signals.h caml/weak.h
+misc_n.$(O): misc.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/config.h \
+ caml/memory.h caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
+ caml/memory.h caml/version.h
 obj_n.$(O): obj.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/gc.h caml/interp.h caml/major_gc.h \
-  caml/freelist.h caml/memory.h caml/minor_gc.h caml/address_class.h \
-  caml/prims.h caml/spacetime.h caml/io.h caml/stack.h
+ caml/mlvalues.h caml/fail.h caml/gc.h caml/interp.h caml/major_gc.h \
+ caml/freelist.h caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/prims.h caml/spacetime.h caml/io.h caml/stack.h
 parsing_n.$(O): parsing.c caml/config.h caml/m.h caml/s.h caml/mlvalues.h \
-  caml/misc.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/alloc.h
+ caml/config.h caml/misc.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/alloc.h
 prims_n.$(O): prims.c caml/mlvalues.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/prims.h
+ caml/misc.h caml/prims.h
 printexc_n.$(O): printexc.c caml/backtrace.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/exec.h caml/callback.h \
-  caml/debugger.h caml/fail.h caml/printexc.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/m.h caml/s.h caml/misc.h caml/exec.h caml/callback.h \
+ caml/debugger.h caml/fail.h caml/misc.h caml/mlvalues.h caml/printexc.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 roots_byt_n.$(O): roots_byt.c caml/finalise.h caml/roots.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h \
-  caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/globroots.h caml/stacks.h
+ caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/globroots.h caml/major_gc.h caml/memory.h caml/minor_gc.h \
+ caml/misc.h caml/mlvalues.h caml/roots.h caml/stacks.h
 roots_nat_n.$(O): roots_nat.c caml/finalise.h caml/roots.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h \
-  caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/globroots.h caml/stack.h
+ caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/globroots.h caml/memory.h caml/major_gc.h caml/minor_gc.h \
+ caml/misc.h caml/mlvalues.h caml/stack.h caml/roots.h
 signals_n.$(O): signals.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/callback.h caml/fail.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/roots.h caml/signals.h \
-  caml/signals_machdep.h caml/sys.h
+ caml/s.h caml/mlvalues.h caml/callback.h caml/config.h caml/fail.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/roots.h \
+ caml/memory.h caml/signals.h caml/signals_machdep.h caml/sys.h
 signals_byt_n.$(O): signals_byt.c caml/config.h caml/m.h caml/s.h \
-  caml/memory.h caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/signals.h caml/signals_machdep.h
+ caml/memory.h caml/config.h caml/gc.h caml/mlvalues.h caml/misc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/signals_machdep.h
 signals_nat_n.$(O): signals_nat.c caml/fail.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/osdeps.h caml/signals.h caml/signals_machdep.h signals_osdep.h \
-  caml/stack.h caml/spacetime.h caml/io.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/signals_machdep.h \
+ signals_osdep.h caml/stack.h caml/spacetime.h caml/io.h caml/stack.h
 spacetime_byt_n.$(O): spacetime_byt.c caml/fail.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/mlvalues.h
 spacetime_nat_n.$(O): spacetime_nat.c caml/config.h caml/m.h caml/s.h \
-  caml/alloc.h caml/misc.h caml/mlvalues.h caml/backtrace_prim.h \
-  caml/backtrace.h caml/exec.h caml/fail.h caml/gc.h caml/intext.h \
-  caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
-  caml/minor_gc.h caml/address_class.h caml/osdeps.h caml/roots.h \
-  caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h
+ caml/alloc.h caml/misc.h caml/config.h caml/mlvalues.h \
+ caml/backtrace_prim.h caml/backtrace.h caml/exec.h caml/fail.h caml/gc.h \
+ caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h \
+ caml/roots.h caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h \
+ caml/stack.h
 spacetime_snapshot_n.$(O): spacetime_snapshot.c caml/alloc.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/mlvalues.h caml/backtrace_prim.h \
-  caml/backtrace.h caml/exec.h caml/custom.h caml/fail.h caml/gc.h \
-  caml/gc_ctrl.h caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/minor_gc.h caml/address_class.h caml/roots.h \
-  caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h
+ caml/config.h caml/m.h caml/s.h caml/mlvalues.h caml/backtrace_prim.h \
+ caml/backtrace.h caml/exec.h caml/config.h caml/custom.h caml/fail.h \
+ caml/gc.h caml/gc_ctrl.h caml/intext.h caml/io.h caml/major_gc.h \
+ caml/freelist.h caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/memory.h caml/signals.h caml/stack.h caml/sys.h \
+ caml/spacetime.h caml/stack.h
 stacks_n.$(O): stacks.c caml/config.h caml/m.h caml/s.h caml/fail.h \
-  caml/misc.h caml/mlvalues.h caml/stacks.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/misc.h caml/mlvalues.h \
+ caml/stacks.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 startup_aux_n.$(O): startup_aux.c caml/backtrace.h caml/mlvalues.h \
-  caml/config.h caml/m.h caml/s.h caml/misc.h caml/exec.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/callback.h caml/osdeps.h caml/startup_aux.h
+ caml/config.h caml/m.h caml/s.h caml/misc.h caml/exec.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/callback.h caml/major_gc.h caml/osdeps.h \
+ caml/memory.h caml/startup_aux.h
 startup_byt_n.$(O): startup_byt.c caml/config.h caml/m.h caml/s.h caml/alloc.h \
-  caml/misc.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
-  caml/callback.h caml/custom.h caml/debugger.h caml/dynlink.h \
-  caml/fail.h caml/fix_code.h caml/freelist.h caml/gc_ctrl.h \
-  caml/instrtrace.h caml/interp.h caml/intext.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
-  caml/osdeps.h caml/prims.h caml/printexc.h caml/reverse.h \
-  caml/signals.h caml/stacks.h caml/sys.h caml/startup.h \
-  caml/startup_aux.h caml/version.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
+ caml/callback.h caml/custom.h caml/debugger.h caml/dynlink.h caml/exec.h \
+ caml/fail.h caml/fix_code.h caml/freelist.h caml/gc_ctrl.h \
+ caml/instrtrace.h caml/interp.h caml/intext.h caml/io.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/osdeps.h caml/memory.h caml/prims.h caml/printexc.h caml/reverse.h \
+ caml/signals.h caml/stacks.h caml/sys.h caml/startup.h \
+ caml/startup_aux.h caml/version.h
 startup_nat_n.$(O): startup_nat.c caml/callback.h caml/mlvalues.h \
-  caml/config.h caml/m.h caml/s.h caml/misc.h caml/backtrace.h \
-  caml/exec.h caml/custom.h caml/debugger.h caml/fail.h caml/freelist.h \
-  caml/gc.h caml/gc_ctrl.h caml/intext.h caml/io.h caml/memory.h \
-  caml/major_gc.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/printexc.h caml/stack.h caml/startup_aux.h caml/sys.h
+ caml/config.h caml/m.h caml/s.h caml/misc.h caml/backtrace.h caml/exec.h \
+ caml/custom.h caml/debugger.h caml/fail.h caml/freelist.h caml/gc.h \
+ caml/gc_ctrl.h caml/intext.h caml/io.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h caml/printexc.h \
+ caml/stack.h caml/startup_aux.h caml/sys.h
 str_n.$(O): str.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/mlvalues.h \
+ caml/misc.h
 sys_n.$(O): sys.c caml/config.h caml/m.h caml/s.h caml/alloc.h caml/misc.h \
-  caml/mlvalues.h caml/debugger.h caml/fail.h caml/gc_ctrl.h caml/io.h \
-  caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/signals.h caml/stacks.h \
-  caml/sys.h caml/version.h caml/callback.h caml/startup_aux.h
+ caml/config.h caml/mlvalues.h caml/debugger.h caml/fail.h caml/gc_ctrl.h \
+ caml/io.h caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/signals.h caml/stacks.h caml/sys.h \
+ caml/version.h caml/callback.h caml/startup_aux.h
 unix_n.$(O): unix.c caml/config.h caml/m.h caml/s.h caml/fail.h caml/misc.h \
-  caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/signals.h caml/sys.h caml/io.h caml/alloc.h
+ caml/config.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/sys.h caml/io.h \
+ caml/alloc.h
 weak_n.$(O): weak.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/weak.h caml/signals.h
-afl_nd.$(O): afl.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/mlvalues.h \
-  caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/fail.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/weak.h caml/minor_gc.h \
+ caml/signals.h
+win32_n.$(O): win32.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
+ caml/mlvalues.h caml/address_class.h caml/fail.h caml/io.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/osdeps.h caml/memory.h \
+ caml/signals.h caml/sys.h caml/config.h
+afl_nd.$(O): afl.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/config.h \
+ caml/mlvalues.h caml/misc.h caml/osdeps.h caml/memory.h caml/gc.h \
+ caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 alloc_nd.$(O): alloc.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/custom.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/stacks.h
+ caml/mlvalues.h caml/custom.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/stacks.h caml/memory.h
 array_nd.$(O): array.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/signals.h \
-  caml/spacetime.h caml/io.h caml/stack.h
+ caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/mlvalues.h caml/signals.h caml/spacetime.h caml/io.h caml/stack.h
 backtrace_nd.$(O): backtrace.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/backtrace.h \
-  caml/exec.h caml/backtrace_prim.h caml/fail.h
+ caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/backtrace.h \
+ caml/exec.h caml/backtrace_prim.h caml/backtrace.h caml/fail.h
 backtrace_byt_nd.$(O): backtrace_byt.c caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/misc.h caml/alloc.h caml/custom.h caml/io.h \
-  caml/instruct.h caml/intext.h caml/exec.h caml/fix_code.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/startup.h caml/stacks.h \
-  caml/sys.h caml/backtrace.h caml/fail.h caml/backtrace_prim.h
+ caml/mlvalues.h caml/config.h caml/misc.h caml/alloc.h caml/mlvalues.h \
+ caml/custom.h caml/io.h caml/instruct.h caml/intext.h caml/io.h \
+ caml/exec.h caml/fix_code.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/startup.h \
+ caml/exec.h caml/stacks.h caml/memory.h caml/sys.h caml/backtrace.h \
+ caml/fail.h caml/backtrace_prim.h caml/backtrace.h
 backtrace_nat_nd.$(O): backtrace_nat.c caml/alloc.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
-  caml/backtrace_prim.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/stack.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
+ caml/backtrace_prim.h caml/backtrace.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/misc.h caml/mlvalues.h caml/stack.h
 bigarray_nd.$(O): bigarray.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/bigarray.h caml/custom.h caml/fail.h \
-  caml/intext.h caml/io.h caml/hash.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/signals.h
+ caml/s.h caml/mlvalues.h caml/bigarray.h caml/custom.h caml/fail.h \
+ caml/intext.h caml/io.h caml/hash.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/signals.h
 callback_nd.$(O): callback.c caml/callback.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/m.h caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h
 clambda_checks_nd.$(O): clambda_checks.c caml/mlvalues.h caml/config.h caml/m.h \
-  caml/s.h caml/misc.h
+ caml/s.h caml/misc.h
 compact_nd.$(O): compact.c caml/address_class.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/finalise.h caml/roots.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/gc_ctrl.h caml/weak.h caml/compact.h
+ caml/misc.h caml/mlvalues.h caml/config.h caml/finalise.h caml/roots.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/freelist.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/mlvalues.h caml/roots.h caml/weak.h \
+ caml/compact.h
 compare_nd.$(O): compare.c caml/custom.h caml/mlvalues.h caml/config.h caml/m.h \
-  caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/mlvalues.h
 custom_nd.$(O): custom.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc_ctrl.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/signals.h
+ caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc_ctrl.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/signals.h
 debugger_nd.$(O): debugger.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/debugger.h caml/osdeps.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h
+ caml/s.h caml/mlvalues.h caml/config.h caml/debugger.h caml/misc.h \
+ caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 dynlink_nd.$(O): dynlink.c caml/config.h caml/m.h caml/s.h caml/alloc.h \
-  caml/misc.h caml/mlvalues.h caml/dynlink.h caml/fail.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/osdeps.h caml/prims.h caml/signals.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/dynlink.h caml/fail.h \
+ caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/misc.h caml/osdeps.h \
+ caml/memory.h caml/prims.h caml/signals.h
 dynlink_nat_nd.$(O): dynlink_nat.c caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/stack.h \
-  caml/callback.h caml/alloc.h caml/intext.h caml/io.h caml/osdeps.h \
-  caml/fail.h caml/signals.h caml/hooks.h
+ caml/mlvalues.h caml/misc.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/stack.h caml/callback.h caml/alloc.h caml/intext.h caml/io.h \
+ caml/osdeps.h caml/memory.h caml/fail.h caml/signals.h caml/hooks.h
 extern_nd.$(O): extern.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc.h \
-  caml/intext.h caml/io.h caml/md5.h caml/memory.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/reverse.h
+ caml/s.h caml/mlvalues.h caml/config.h caml/custom.h caml/fail.h \
+ caml/gc.h caml/intext.h caml/io.h caml/io.h caml/md5.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/reverse.h
 fail_byt_nd.$(O): fail_byt.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/printexc.h caml/signals.h caml/stacks.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/printexc.h \
+ caml/signals.h caml/stacks.h caml/memory.h
 fail_nat_nd.$(O): fail_nat.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/printexc.h caml/signals.h caml/stack.h caml/roots.h \
-  caml/callback.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/printexc.h caml/signals.h \
+ caml/stack.h caml/roots.h caml/memory.h caml/callback.h
 finalise_nd.$(O): finalise.c caml/callback.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/compact.h caml/fail.h \
-  caml/finalise.h caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/signals.h
+ caml/m.h caml/s.h caml/misc.h caml/compact.h caml/fail.h caml/finalise.h \
+ caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/minor_gc.h caml/mlvalues.h \
+ caml/roots.h caml/signals.h
 fix_code_nd.$(O): fix_code.c caml/config.h caml/m.h caml/s.h caml/debugger.h \
-  caml/misc.h caml/mlvalues.h caml/fix_code.h caml/instruct.h \
-  caml/intext.h caml/io.h caml/md5.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/fix_code.h \
+ caml/instruct.h caml/intext.h caml/io.h caml/md5.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/reverse.h
 floats_nd.$(O): floats.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h caml/stacks.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/misc.h caml/reverse.h caml/stacks.h caml/memory.h
 freelist_nd.$(O): freelist.c caml/config.h caml/m.h caml/s.h caml/freelist.h \
-  caml/misc.h caml/mlvalues.h caml/gc.h caml/gc_ctrl.h caml/memory.h \
-  caml/major_gc.h caml/minor_gc.h caml/address_class.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/gc.h caml/gc_ctrl.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/major_gc.h caml/misc.h caml/mlvalues.h
 gc_ctrl_nd.$(O): gc_ctrl.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/compact.h \
-  caml/custom.h caml/fail.h caml/finalise.h caml/roots.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/gc_ctrl.h caml/signals.h caml/stack.h \
-  caml/startup_aux.h
+ caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/compact.h \
+ caml/custom.h caml/fail.h caml/finalise.h caml/roots.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/freelist.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/minor_gc.h caml/misc.h \
+ caml/mlvalues.h caml/signals.h caml/stack.h caml/startup_aux.h
 globroots_nd.$(O): globroots.c caml/memory.h caml/config.h caml/m.h caml/s.h \
-  caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/roots.h caml/globroots.h
+ caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/memory.h caml/globroots.h caml/roots.h
 hash_nd.$(O): hash.c caml/mlvalues.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/custom.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/hash.h
+ caml/misc.h caml/custom.h caml/mlvalues.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/hash.h
 instrtrace_nd.$(O): instrtrace.c caml/instrtrace.h caml/mlvalues.h \
-  caml/config.h caml/m.h caml/s.h caml/misc.h caml/instruct.h \
-  caml/opnames.h caml/prims.h caml/stacks.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/startup_aux.h
+ caml/config.h caml/m.h caml/s.h caml/misc.h caml/instruct.h caml/misc.h \
+ caml/mlvalues.h caml/opnames.h caml/prims.h caml/stacks.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/startup_aux.h
 intern_nd.$(O): intern.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/callback.h caml/custom.h caml/fail.h \
-  caml/gc.h caml/intext.h caml/io.h caml/md5.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h
+ caml/s.h caml/mlvalues.h caml/callback.h caml/config.h caml/custom.h \
+ caml/fail.h caml/gc.h caml/intext.h caml/io.h caml/io.h caml/md5.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/misc.h caml/reverse.h
 interp_nd.$(O): interp.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/callback.h \
-  caml/debugger.h caml/fail.h caml/fix_code.h caml/instrtrace.h \
-  caml/instruct.h caml/interp.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/prims.h caml/signals.h caml/stacks.h caml/startup_aux.h
+ caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/callback.h \
+ caml/debugger.h caml/fail.h caml/fix_code.h caml/instrtrace.h \
+ caml/instruct.h caml/interp.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/prims.h \
+ caml/signals.h caml/stacks.h caml/memory.h caml/startup_aux.h
 ints_nd.$(O): ints.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/custom.h caml/fail.h caml/intext.h caml/io.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/custom.h caml/fail.h caml/intext.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h
 io_nd.$(O): io.c caml/config.h caml/m.h caml/s.h caml/alloc.h caml/misc.h \
-  caml/mlvalues.h caml/custom.h caml/fail.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/osdeps.h caml/signals.h caml/sys.h
+ caml/config.h caml/mlvalues.h caml/custom.h caml/fail.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/osdeps.h \
+ caml/memory.h caml/signals.h caml/sys.h
 lexing_nd.$(O): lexing.c caml/fail.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/stacks.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/s.h caml/mlvalues.h caml/mlvalues.h caml/stacks.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 main_nd.$(O): main.c caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/sys.h caml/osdeps.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/misc.h caml/sys.h caml/osdeps.h caml/memory.h \
+ caml/gc.h caml/mlvalues.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 major_gc_nd.$(O): major_gc.c caml/compact.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/custom.h caml/fail.h caml/finalise.h \
-  caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/gc_ctrl.h caml/signals.h \
-  caml/weak.h
+ caml/misc.h caml/mlvalues.h caml/custom.h caml/config.h caml/fail.h \
+ caml/finalise.h caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/freelist.h \
+ caml/gc.h caml/gc_ctrl.h caml/major_gc.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/signals.h caml/weak.h
 md5_nd.$(O): md5.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/md5.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/reverse.h
+ caml/mlvalues.h caml/fail.h caml/md5.h caml/io.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/io.h caml/reverse.h
 memory_nd.$(O): memory.c caml/address_class.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/fail.h caml/freelist.h caml/gc.h \
-  caml/gc_ctrl.h caml/major_gc.h caml/memory.h caml/minor_gc.h \
-  caml/signals.h
+ caml/misc.h caml/mlvalues.h caml/config.h caml/fail.h caml/freelist.h \
+ caml/gc.h caml/gc_ctrl.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/signals.h
 meta_nd.$(O): meta.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/fix_code.h caml/interp.h \
-  caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
-  caml/gc.h caml/minor_gc.h caml/address_class.h caml/prims.h \
-  caml/stacks.h caml/backtrace_prim.h caml/backtrace.h caml/exec.h
+ caml/mlvalues.h caml/config.h caml/fail.h caml/fix_code.h caml/interp.h \
+ caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/prims.h caml/stacks.h \
+ caml/memory.h caml/backtrace_prim.h caml/backtrace.h caml/exec.h
 minor_gc_nd.$(O): minor_gc.c caml/custom.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/fail.h caml/finalise.h caml/roots.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/gc_ctrl.h caml/signals.h \
-  caml/weak.h
-misc_nd.$(O): misc.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/memory.h \
-  caml/gc.h caml/mlvalues.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/osdeps.h caml/version.h
+ caml/m.h caml/s.h caml/misc.h caml/config.h caml/fail.h caml/finalise.h \
+ caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/minor_gc.h caml/misc.h \
+ caml/mlvalues.h caml/roots.h caml/signals.h caml/weak.h
+misc_nd.$(O): misc.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/config.h \
+ caml/memory.h caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
+ caml/memory.h caml/version.h
 obj_nd.$(O): obj.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/gc.h caml/interp.h caml/major_gc.h \
-  caml/freelist.h caml/memory.h caml/minor_gc.h caml/address_class.h \
-  caml/prims.h caml/spacetime.h caml/io.h caml/stack.h
+ caml/mlvalues.h caml/fail.h caml/gc.h caml/interp.h caml/major_gc.h \
+ caml/freelist.h caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/prims.h caml/spacetime.h caml/io.h caml/stack.h
 parsing_nd.$(O): parsing.c caml/config.h caml/m.h caml/s.h caml/mlvalues.h \
-  caml/misc.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/alloc.h
+ caml/config.h caml/misc.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/alloc.h
 prims_nd.$(O): prims.c caml/mlvalues.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/prims.h
+ caml/misc.h caml/prims.h
 printexc_nd.$(O): printexc.c caml/backtrace.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/exec.h caml/callback.h \
-  caml/debugger.h caml/fail.h caml/printexc.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/m.h caml/s.h caml/misc.h caml/exec.h caml/callback.h \
+ caml/debugger.h caml/fail.h caml/misc.h caml/mlvalues.h caml/printexc.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 roots_byt_nd.$(O): roots_byt.c caml/finalise.h caml/roots.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h \
-  caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/globroots.h caml/stacks.h
+ caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/globroots.h caml/major_gc.h caml/memory.h caml/minor_gc.h \
+ caml/misc.h caml/mlvalues.h caml/roots.h caml/stacks.h
 roots_nat_nd.$(O): roots_nat.c caml/finalise.h caml/roots.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h \
-  caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/globroots.h caml/stack.h
+ caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/globroots.h caml/memory.h caml/major_gc.h caml/minor_gc.h \
+ caml/misc.h caml/mlvalues.h caml/stack.h caml/roots.h
 signals_nd.$(O): signals.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/callback.h caml/fail.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/roots.h caml/signals.h \
-  caml/signals_machdep.h caml/sys.h
+ caml/s.h caml/mlvalues.h caml/callback.h caml/config.h caml/fail.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/roots.h \
+ caml/memory.h caml/signals.h caml/signals_machdep.h caml/sys.h
 signals_byt_nd.$(O): signals_byt.c caml/config.h caml/m.h caml/s.h \
-  caml/memory.h caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/signals.h caml/signals_machdep.h
+ caml/memory.h caml/config.h caml/gc.h caml/mlvalues.h caml/misc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/signals_machdep.h
 signals_nat_nd.$(O): signals_nat.c caml/fail.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/osdeps.h caml/signals.h caml/signals_machdep.h signals_osdep.h \
-  caml/stack.h caml/spacetime.h caml/io.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/signals_machdep.h \
+ signals_osdep.h caml/stack.h caml/spacetime.h caml/io.h caml/stack.h
 spacetime_byt_nd.$(O): spacetime_byt.c caml/fail.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/mlvalues.h
 spacetime_nat_nd.$(O): spacetime_nat.c caml/config.h caml/m.h caml/s.h \
-  caml/alloc.h caml/misc.h caml/mlvalues.h caml/backtrace_prim.h \
-  caml/backtrace.h caml/exec.h caml/fail.h caml/gc.h caml/intext.h \
-  caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
-  caml/minor_gc.h caml/address_class.h caml/osdeps.h caml/roots.h \
-  caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h
+ caml/alloc.h caml/misc.h caml/config.h caml/mlvalues.h \
+ caml/backtrace_prim.h caml/backtrace.h caml/exec.h caml/fail.h caml/gc.h \
+ caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h \
+ caml/roots.h caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h \
+ caml/stack.h
 spacetime_snapshot_nd.$(O): spacetime_snapshot.c caml/alloc.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/mlvalues.h caml/backtrace_prim.h \
-  caml/backtrace.h caml/exec.h caml/custom.h caml/fail.h caml/gc.h \
-  caml/gc_ctrl.h caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/minor_gc.h caml/address_class.h caml/roots.h \
-  caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h
+ caml/config.h caml/m.h caml/s.h caml/mlvalues.h caml/backtrace_prim.h \
+ caml/backtrace.h caml/exec.h caml/config.h caml/custom.h caml/fail.h \
+ caml/gc.h caml/gc_ctrl.h caml/intext.h caml/io.h caml/major_gc.h \
+ caml/freelist.h caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/memory.h caml/signals.h caml/stack.h caml/sys.h \
+ caml/spacetime.h caml/stack.h
 stacks_nd.$(O): stacks.c caml/config.h caml/m.h caml/s.h caml/fail.h \
-  caml/misc.h caml/mlvalues.h caml/stacks.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/misc.h caml/mlvalues.h \
+ caml/stacks.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 startup_aux_nd.$(O): startup_aux.c caml/backtrace.h caml/mlvalues.h \
-  caml/config.h caml/m.h caml/s.h caml/misc.h caml/exec.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/callback.h caml/osdeps.h caml/startup_aux.h
+ caml/config.h caml/m.h caml/s.h caml/misc.h caml/exec.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/callback.h caml/major_gc.h caml/osdeps.h \
+ caml/memory.h caml/startup_aux.h
 startup_byt_nd.$(O): startup_byt.c caml/config.h caml/m.h caml/s.h caml/alloc.h \
-  caml/misc.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
-  caml/callback.h caml/custom.h caml/debugger.h caml/dynlink.h \
-  caml/fail.h caml/fix_code.h caml/freelist.h caml/gc_ctrl.h \
-  caml/instrtrace.h caml/interp.h caml/intext.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
-  caml/osdeps.h caml/prims.h caml/printexc.h caml/reverse.h \
-  caml/signals.h caml/stacks.h caml/sys.h caml/startup.h \
-  caml/startup_aux.h caml/version.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
+ caml/callback.h caml/custom.h caml/debugger.h caml/dynlink.h caml/exec.h \
+ caml/fail.h caml/fix_code.h caml/freelist.h caml/gc_ctrl.h \
+ caml/instrtrace.h caml/interp.h caml/intext.h caml/io.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/osdeps.h caml/memory.h caml/prims.h caml/printexc.h caml/reverse.h \
+ caml/signals.h caml/stacks.h caml/sys.h caml/startup.h \
+ caml/startup_aux.h caml/version.h
 startup_nat_nd.$(O): startup_nat.c caml/callback.h caml/mlvalues.h \
-  caml/config.h caml/m.h caml/s.h caml/misc.h caml/backtrace.h \
-  caml/exec.h caml/custom.h caml/debugger.h caml/fail.h caml/freelist.h \
-  caml/gc.h caml/gc_ctrl.h caml/intext.h caml/io.h caml/memory.h \
-  caml/major_gc.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/printexc.h caml/stack.h caml/startup_aux.h caml/sys.h
+ caml/config.h caml/m.h caml/s.h caml/misc.h caml/backtrace.h caml/exec.h \
+ caml/custom.h caml/debugger.h caml/fail.h caml/freelist.h caml/gc.h \
+ caml/gc_ctrl.h caml/intext.h caml/io.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h caml/printexc.h \
+ caml/stack.h caml/startup_aux.h caml/sys.h
 str_nd.$(O): str.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/mlvalues.h \
+ caml/misc.h
 sys_nd.$(O): sys.c caml/config.h caml/m.h caml/s.h caml/alloc.h caml/misc.h \
-  caml/mlvalues.h caml/debugger.h caml/fail.h caml/gc_ctrl.h caml/io.h \
-  caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/signals.h caml/stacks.h \
-  caml/sys.h caml/version.h caml/callback.h caml/startup_aux.h
+ caml/config.h caml/mlvalues.h caml/debugger.h caml/fail.h caml/gc_ctrl.h \
+ caml/io.h caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/signals.h caml/stacks.h caml/sys.h \
+ caml/version.h caml/callback.h caml/startup_aux.h
 unix_nd.$(O): unix.c caml/config.h caml/m.h caml/s.h caml/fail.h caml/misc.h \
-  caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/signals.h caml/sys.h caml/io.h caml/alloc.h
+ caml/config.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/sys.h caml/io.h \
+ caml/alloc.h
 weak_nd.$(O): weak.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/weak.h caml/signals.h
-afl_ni.$(O): afl.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/mlvalues.h \
-  caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/fail.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/weak.h caml/minor_gc.h \
+ caml/signals.h
+win32_nd.$(O): win32.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
+ caml/mlvalues.h caml/address_class.h caml/fail.h caml/io.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/osdeps.h caml/memory.h \
+ caml/signals.h caml/sys.h caml/config.h
+afl_ni.$(O): afl.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/config.h \
+ caml/mlvalues.h caml/misc.h caml/osdeps.h caml/memory.h caml/gc.h \
+ caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 alloc_ni.$(O): alloc.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/custom.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/stacks.h
+ caml/mlvalues.h caml/custom.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/stacks.h caml/memory.h
 array_ni.$(O): array.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/signals.h \
-  caml/spacetime.h caml/io.h caml/stack.h
+ caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/mlvalues.h caml/signals.h caml/spacetime.h caml/io.h caml/stack.h
 backtrace_ni.$(O): backtrace.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/backtrace.h \
-  caml/exec.h caml/backtrace_prim.h caml/fail.h
+ caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/backtrace.h \
+ caml/exec.h caml/backtrace_prim.h caml/backtrace.h caml/fail.h
 backtrace_byt_ni.$(O): backtrace_byt.c caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/misc.h caml/alloc.h caml/custom.h caml/io.h \
-  caml/instruct.h caml/intext.h caml/exec.h caml/fix_code.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/startup.h caml/stacks.h \
-  caml/sys.h caml/backtrace.h caml/fail.h caml/backtrace_prim.h
+ caml/mlvalues.h caml/config.h caml/misc.h caml/alloc.h caml/mlvalues.h \
+ caml/custom.h caml/io.h caml/instruct.h caml/intext.h caml/io.h \
+ caml/exec.h caml/fix_code.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/startup.h \
+ caml/exec.h caml/stacks.h caml/memory.h caml/sys.h caml/backtrace.h \
+ caml/fail.h caml/backtrace_prim.h caml/backtrace.h
 backtrace_nat_ni.$(O): backtrace_nat.c caml/alloc.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
-  caml/backtrace_prim.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/stack.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
+ caml/backtrace_prim.h caml/backtrace.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/misc.h caml/mlvalues.h caml/stack.h
 bigarray_ni.$(O): bigarray.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/bigarray.h caml/custom.h caml/fail.h \
-  caml/intext.h caml/io.h caml/hash.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/signals.h
+ caml/s.h caml/mlvalues.h caml/bigarray.h caml/custom.h caml/fail.h \
+ caml/intext.h caml/io.h caml/hash.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/signals.h
 callback_ni.$(O): callback.c caml/callback.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/m.h caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h
 clambda_checks_ni.$(O): clambda_checks.c caml/mlvalues.h caml/config.h caml/m.h \
-  caml/s.h caml/misc.h
+ caml/s.h caml/misc.h
 compact_ni.$(O): compact.c caml/address_class.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/finalise.h caml/roots.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/gc_ctrl.h caml/weak.h caml/compact.h
+ caml/misc.h caml/mlvalues.h caml/config.h caml/finalise.h caml/roots.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/freelist.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/mlvalues.h caml/roots.h caml/weak.h \
+ caml/compact.h
 compare_ni.$(O): compare.c caml/custom.h caml/mlvalues.h caml/config.h caml/m.h \
-  caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/mlvalues.h
 custom_ni.$(O): custom.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc_ctrl.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/signals.h
+ caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc_ctrl.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/signals.h
 debugger_ni.$(O): debugger.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/debugger.h caml/osdeps.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h
+ caml/s.h caml/mlvalues.h caml/config.h caml/debugger.h caml/misc.h \
+ caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 dynlink_ni.$(O): dynlink.c caml/config.h caml/m.h caml/s.h caml/alloc.h \
-  caml/misc.h caml/mlvalues.h caml/dynlink.h caml/fail.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/osdeps.h caml/prims.h caml/signals.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/dynlink.h caml/fail.h \
+ caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/misc.h caml/osdeps.h \
+ caml/memory.h caml/prims.h caml/signals.h
 dynlink_nat_ni.$(O): dynlink_nat.c caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/stack.h \
-  caml/callback.h caml/alloc.h caml/intext.h caml/io.h caml/osdeps.h \
-  caml/fail.h caml/signals.h caml/hooks.h
+ caml/mlvalues.h caml/misc.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/stack.h caml/callback.h caml/alloc.h caml/intext.h caml/io.h \
+ caml/osdeps.h caml/memory.h caml/fail.h caml/signals.h caml/hooks.h
 extern_ni.$(O): extern.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc.h \
-  caml/intext.h caml/io.h caml/md5.h caml/memory.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/reverse.h
+ caml/s.h caml/mlvalues.h caml/config.h caml/custom.h caml/fail.h \
+ caml/gc.h caml/intext.h caml/io.h caml/io.h caml/md5.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/reverse.h
 fail_byt_ni.$(O): fail_byt.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/printexc.h caml/signals.h caml/stacks.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/printexc.h \
+ caml/signals.h caml/stacks.h caml/memory.h
 fail_nat_ni.$(O): fail_nat.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/printexc.h caml/signals.h caml/stack.h caml/roots.h \
-  caml/callback.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/printexc.h caml/signals.h \
+ caml/stack.h caml/roots.h caml/memory.h caml/callback.h
 finalise_ni.$(O): finalise.c caml/callback.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/compact.h caml/fail.h \
-  caml/finalise.h caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/signals.h
+ caml/m.h caml/s.h caml/misc.h caml/compact.h caml/fail.h caml/finalise.h \
+ caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/minor_gc.h caml/mlvalues.h \
+ caml/roots.h caml/signals.h
 fix_code_ni.$(O): fix_code.c caml/config.h caml/m.h caml/s.h caml/debugger.h \
-  caml/misc.h caml/mlvalues.h caml/fix_code.h caml/instruct.h \
-  caml/intext.h caml/io.h caml/md5.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/fix_code.h \
+ caml/instruct.h caml/intext.h caml/io.h caml/md5.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/reverse.h
 floats_ni.$(O): floats.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h caml/stacks.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/misc.h caml/reverse.h caml/stacks.h caml/memory.h
 freelist_ni.$(O): freelist.c caml/config.h caml/m.h caml/s.h caml/freelist.h \
-  caml/misc.h caml/mlvalues.h caml/gc.h caml/gc_ctrl.h caml/memory.h \
-  caml/major_gc.h caml/minor_gc.h caml/address_class.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/gc.h caml/gc_ctrl.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/major_gc.h caml/misc.h caml/mlvalues.h
 gc_ctrl_ni.$(O): gc_ctrl.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/compact.h \
-  caml/custom.h caml/fail.h caml/finalise.h caml/roots.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/gc_ctrl.h caml/signals.h caml/stack.h \
-  caml/startup_aux.h
+ caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/compact.h \
+ caml/custom.h caml/fail.h caml/finalise.h caml/roots.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/freelist.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/minor_gc.h caml/misc.h \
+ caml/mlvalues.h caml/signals.h caml/stack.h caml/startup_aux.h
 globroots_ni.$(O): globroots.c caml/memory.h caml/config.h caml/m.h caml/s.h \
-  caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/roots.h caml/globroots.h
+ caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/memory.h caml/globroots.h caml/roots.h
 hash_ni.$(O): hash.c caml/mlvalues.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/custom.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/hash.h
+ caml/misc.h caml/custom.h caml/mlvalues.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/hash.h
 instrtrace_ni.$(O): instrtrace.c
 intern_ni.$(O): intern.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/callback.h caml/custom.h caml/fail.h \
-  caml/gc.h caml/intext.h caml/io.h caml/md5.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h
+ caml/s.h caml/mlvalues.h caml/callback.h caml/config.h caml/custom.h \
+ caml/fail.h caml/gc.h caml/intext.h caml/io.h caml/io.h caml/md5.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/misc.h caml/reverse.h
 interp_ni.$(O): interp.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/callback.h \
-  caml/debugger.h caml/fail.h caml/fix_code.h caml/instrtrace.h \
-  caml/instruct.h caml/interp.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/prims.h caml/signals.h caml/stacks.h caml/startup_aux.h \
-  caml/jumptbl.h
+ caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/callback.h \
+ caml/debugger.h caml/fail.h caml/fix_code.h caml/instrtrace.h \
+ caml/instruct.h caml/interp.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/prims.h \
+ caml/signals.h caml/stacks.h caml/memory.h caml/startup_aux.h \
+ caml/jumptbl.h
 ints_ni.$(O): ints.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/custom.h caml/fail.h caml/intext.h caml/io.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/custom.h caml/fail.h caml/intext.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h
 io_ni.$(O): io.c caml/config.h caml/m.h caml/s.h caml/alloc.h caml/misc.h \
-  caml/mlvalues.h caml/custom.h caml/fail.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/osdeps.h caml/signals.h caml/sys.h
+ caml/config.h caml/mlvalues.h caml/custom.h caml/fail.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/osdeps.h \
+ caml/memory.h caml/signals.h caml/sys.h
 lexing_ni.$(O): lexing.c caml/fail.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/stacks.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/s.h caml/mlvalues.h caml/mlvalues.h caml/stacks.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 main_ni.$(O): main.c caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/sys.h caml/osdeps.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/misc.h caml/sys.h caml/osdeps.h caml/memory.h \
+ caml/gc.h caml/mlvalues.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 major_gc_ni.$(O): major_gc.c caml/compact.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/custom.h caml/fail.h caml/finalise.h \
-  caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/gc_ctrl.h caml/signals.h \
-  caml/weak.h
+ caml/misc.h caml/mlvalues.h caml/custom.h caml/config.h caml/fail.h \
+ caml/finalise.h caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/freelist.h \
+ caml/gc.h caml/gc_ctrl.h caml/major_gc.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/signals.h caml/weak.h
 md5_ni.$(O): md5.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/md5.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/reverse.h
+ caml/mlvalues.h caml/fail.h caml/md5.h caml/io.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/io.h caml/reverse.h
 memory_ni.$(O): memory.c caml/address_class.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/fail.h caml/freelist.h caml/gc.h \
-  caml/gc_ctrl.h caml/major_gc.h caml/memory.h caml/minor_gc.h \
-  caml/signals.h
+ caml/misc.h caml/mlvalues.h caml/config.h caml/fail.h caml/freelist.h \
+ caml/gc.h caml/gc_ctrl.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/signals.h
 meta_ni.$(O): meta.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/fix_code.h caml/interp.h \
-  caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
-  caml/gc.h caml/minor_gc.h caml/address_class.h caml/prims.h \
-  caml/stacks.h caml/backtrace_prim.h caml/backtrace.h caml/exec.h
+ caml/mlvalues.h caml/config.h caml/fail.h caml/fix_code.h caml/interp.h \
+ caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/prims.h caml/stacks.h \
+ caml/memory.h caml/backtrace_prim.h caml/backtrace.h caml/exec.h
 minor_gc_ni.$(O): minor_gc.c caml/custom.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/fail.h caml/finalise.h caml/roots.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/gc_ctrl.h caml/signals.h \
-  caml/weak.h
-misc_ni.$(O): misc.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/memory.h \
-  caml/gc.h caml/mlvalues.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/osdeps.h caml/version.h
+ caml/m.h caml/s.h caml/misc.h caml/config.h caml/fail.h caml/finalise.h \
+ caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/minor_gc.h caml/misc.h \
+ caml/mlvalues.h caml/roots.h caml/signals.h caml/weak.h
+misc_ni.$(O): misc.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/config.h \
+ caml/memory.h caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
+ caml/memory.h caml/version.h
 obj_ni.$(O): obj.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/gc.h caml/interp.h caml/major_gc.h \
-  caml/freelist.h caml/memory.h caml/minor_gc.h caml/address_class.h \
-  caml/prims.h caml/spacetime.h caml/io.h caml/stack.h
+ caml/mlvalues.h caml/fail.h caml/gc.h caml/interp.h caml/major_gc.h \
+ caml/freelist.h caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/prims.h caml/spacetime.h caml/io.h caml/stack.h
 parsing_ni.$(O): parsing.c caml/config.h caml/m.h caml/s.h caml/mlvalues.h \
-  caml/misc.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/alloc.h
+ caml/config.h caml/misc.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/alloc.h
 prims_ni.$(O): prims.c caml/mlvalues.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/prims.h
+ caml/misc.h caml/prims.h
 printexc_ni.$(O): printexc.c caml/backtrace.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/exec.h caml/callback.h \
-  caml/debugger.h caml/fail.h caml/printexc.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/m.h caml/s.h caml/misc.h caml/exec.h caml/callback.h \
+ caml/debugger.h caml/fail.h caml/misc.h caml/mlvalues.h caml/printexc.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 roots_byt_ni.$(O): roots_byt.c caml/finalise.h caml/roots.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h \
-  caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/globroots.h caml/stacks.h
+ caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/globroots.h caml/major_gc.h caml/memory.h caml/minor_gc.h \
+ caml/misc.h caml/mlvalues.h caml/roots.h caml/stacks.h
 roots_nat_ni.$(O): roots_nat.c caml/finalise.h caml/roots.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h \
-  caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/globroots.h caml/stack.h
+ caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/globroots.h caml/memory.h caml/major_gc.h caml/minor_gc.h \
+ caml/misc.h caml/mlvalues.h caml/stack.h caml/roots.h
 signals_ni.$(O): signals.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/callback.h caml/fail.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/roots.h caml/signals.h \
-  caml/signals_machdep.h caml/sys.h
+ caml/s.h caml/mlvalues.h caml/callback.h caml/config.h caml/fail.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/roots.h \
+ caml/memory.h caml/signals.h caml/signals_machdep.h caml/sys.h
 signals_byt_ni.$(O): signals_byt.c caml/config.h caml/m.h caml/s.h \
-  caml/memory.h caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/signals.h caml/signals_machdep.h
+ caml/memory.h caml/config.h caml/gc.h caml/mlvalues.h caml/misc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/signals_machdep.h
 signals_nat_ni.$(O): signals_nat.c caml/fail.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/osdeps.h caml/signals.h caml/signals_machdep.h signals_osdep.h \
-  caml/stack.h caml/spacetime.h caml/io.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/signals_machdep.h \
+ signals_osdep.h caml/stack.h caml/spacetime.h caml/io.h caml/stack.h
 spacetime_byt_ni.$(O): spacetime_byt.c caml/fail.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/mlvalues.h
 spacetime_nat_ni.$(O): spacetime_nat.c caml/config.h caml/m.h caml/s.h \
-  caml/alloc.h caml/misc.h caml/mlvalues.h caml/backtrace_prim.h \
-  caml/backtrace.h caml/exec.h caml/fail.h caml/gc.h caml/intext.h \
-  caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
-  caml/minor_gc.h caml/address_class.h caml/osdeps.h caml/roots.h \
-  caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h
+ caml/alloc.h caml/misc.h caml/config.h caml/mlvalues.h \
+ caml/backtrace_prim.h caml/backtrace.h caml/exec.h caml/fail.h caml/gc.h \
+ caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h \
+ caml/roots.h caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h \
+ caml/stack.h
 spacetime_snapshot_ni.$(O): spacetime_snapshot.c caml/alloc.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/mlvalues.h caml/backtrace_prim.h \
-  caml/backtrace.h caml/exec.h caml/custom.h caml/fail.h caml/gc.h \
-  caml/gc_ctrl.h caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/minor_gc.h caml/address_class.h caml/roots.h \
-  caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h
+ caml/config.h caml/m.h caml/s.h caml/mlvalues.h caml/backtrace_prim.h \
+ caml/backtrace.h caml/exec.h caml/config.h caml/custom.h caml/fail.h \
+ caml/gc.h caml/gc_ctrl.h caml/intext.h caml/io.h caml/major_gc.h \
+ caml/freelist.h caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/memory.h caml/signals.h caml/stack.h caml/sys.h \
+ caml/spacetime.h caml/stack.h
 stacks_ni.$(O): stacks.c caml/config.h caml/m.h caml/s.h caml/fail.h \
-  caml/misc.h caml/mlvalues.h caml/stacks.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/misc.h caml/mlvalues.h \
+ caml/stacks.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 startup_aux_ni.$(O): startup_aux.c caml/backtrace.h caml/mlvalues.h \
-  caml/config.h caml/m.h caml/s.h caml/misc.h caml/exec.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/callback.h caml/osdeps.h caml/startup_aux.h
+ caml/config.h caml/m.h caml/s.h caml/misc.h caml/exec.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/callback.h caml/major_gc.h caml/osdeps.h \
+ caml/memory.h caml/startup_aux.h
 startup_byt_ni.$(O): startup_byt.c caml/config.h caml/m.h caml/s.h caml/alloc.h \
-  caml/misc.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
-  caml/callback.h caml/custom.h caml/debugger.h caml/dynlink.h \
-  caml/fail.h caml/fix_code.h caml/freelist.h caml/gc_ctrl.h \
-  caml/instrtrace.h caml/interp.h caml/intext.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
-  caml/osdeps.h caml/prims.h caml/printexc.h caml/reverse.h \
-  caml/signals.h caml/stacks.h caml/sys.h caml/startup.h \
-  caml/startup_aux.h caml/version.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
+ caml/callback.h caml/custom.h caml/debugger.h caml/dynlink.h caml/exec.h \
+ caml/fail.h caml/fix_code.h caml/freelist.h caml/gc_ctrl.h \
+ caml/instrtrace.h caml/interp.h caml/intext.h caml/io.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/osdeps.h caml/memory.h caml/prims.h caml/printexc.h caml/reverse.h \
+ caml/signals.h caml/stacks.h caml/sys.h caml/startup.h \
+ caml/startup_aux.h caml/version.h
 startup_nat_ni.$(O): startup_nat.c caml/callback.h caml/mlvalues.h \
-  caml/config.h caml/m.h caml/s.h caml/misc.h caml/backtrace.h \
-  caml/exec.h caml/custom.h caml/debugger.h caml/fail.h caml/freelist.h \
-  caml/gc.h caml/gc_ctrl.h caml/intext.h caml/io.h caml/memory.h \
-  caml/major_gc.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/printexc.h caml/stack.h caml/startup_aux.h caml/sys.h
+ caml/config.h caml/m.h caml/s.h caml/misc.h caml/backtrace.h caml/exec.h \
+ caml/custom.h caml/debugger.h caml/fail.h caml/freelist.h caml/gc.h \
+ caml/gc_ctrl.h caml/intext.h caml/io.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h caml/printexc.h \
+ caml/stack.h caml/startup_aux.h caml/sys.h
 str_ni.$(O): str.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/mlvalues.h \
+ caml/misc.h
 sys_ni.$(O): sys.c caml/config.h caml/m.h caml/s.h caml/alloc.h caml/misc.h \
-  caml/mlvalues.h caml/debugger.h caml/fail.h caml/gc_ctrl.h caml/io.h \
-  caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/signals.h caml/stacks.h \
-  caml/sys.h caml/version.h caml/callback.h caml/startup_aux.h
+ caml/config.h caml/mlvalues.h caml/debugger.h caml/fail.h caml/gc_ctrl.h \
+ caml/io.h caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/signals.h caml/stacks.h caml/sys.h \
+ caml/version.h caml/callback.h caml/startup_aux.h
 unix_ni.$(O): unix.c caml/config.h caml/m.h caml/s.h caml/fail.h caml/misc.h \
-  caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/signals.h caml/sys.h caml/io.h caml/alloc.h
+ caml/config.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/sys.h caml/io.h \
+ caml/alloc.h
 weak_ni.$(O): weak.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/weak.h caml/signals.h
-afl_np.$(O): afl.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/mlvalues.h \
-  caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/fail.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/weak.h caml/minor_gc.h \
+ caml/signals.h
+win32_ni.$(O): win32.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
+ caml/mlvalues.h caml/address_class.h caml/fail.h caml/io.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/osdeps.h caml/memory.h \
+ caml/signals.h caml/sys.h caml/config.h
+afl_np.$(O): afl.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/config.h \
+ caml/mlvalues.h caml/misc.h caml/osdeps.h caml/memory.h caml/gc.h \
+ caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 alloc_np.$(O): alloc.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/custom.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/stacks.h
+ caml/mlvalues.h caml/custom.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/stacks.h caml/memory.h
 array_np.$(O): array.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/signals.h \
-  caml/spacetime.h caml/io.h caml/stack.h
+ caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/mlvalues.h caml/signals.h caml/spacetime.h caml/io.h caml/stack.h
 backtrace_np.$(O): backtrace.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/backtrace.h \
-  caml/exec.h caml/backtrace_prim.h caml/fail.h
+ caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/backtrace.h \
+ caml/exec.h caml/backtrace_prim.h caml/backtrace.h caml/fail.h
 backtrace_byt_np.$(O): backtrace_byt.c caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/misc.h caml/alloc.h caml/custom.h caml/io.h \
-  caml/instruct.h caml/intext.h caml/exec.h caml/fix_code.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/startup.h caml/stacks.h \
-  caml/sys.h caml/backtrace.h caml/fail.h caml/backtrace_prim.h
+ caml/mlvalues.h caml/config.h caml/misc.h caml/alloc.h caml/mlvalues.h \
+ caml/custom.h caml/io.h caml/instruct.h caml/intext.h caml/io.h \
+ caml/exec.h caml/fix_code.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/startup.h \
+ caml/exec.h caml/stacks.h caml/memory.h caml/sys.h caml/backtrace.h \
+ caml/fail.h caml/backtrace_prim.h caml/backtrace.h
 backtrace_nat_np.$(O): backtrace_nat.c caml/alloc.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
-  caml/backtrace_prim.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/stack.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
+ caml/backtrace_prim.h caml/backtrace.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/misc.h caml/mlvalues.h caml/stack.h
 bigarray_np.$(O): bigarray.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/bigarray.h caml/custom.h caml/fail.h \
-  caml/intext.h caml/io.h caml/hash.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/signals.h
+ caml/s.h caml/mlvalues.h caml/bigarray.h caml/custom.h caml/fail.h \
+ caml/intext.h caml/io.h caml/hash.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/signals.h
 callback_np.$(O): callback.c caml/callback.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/m.h caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h
 clambda_checks_np.$(O): clambda_checks.c caml/mlvalues.h caml/config.h caml/m.h \
-  caml/s.h caml/misc.h
+ caml/s.h caml/misc.h
 compact_np.$(O): compact.c caml/address_class.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/finalise.h caml/roots.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/gc_ctrl.h caml/weak.h caml/compact.h
+ caml/misc.h caml/mlvalues.h caml/config.h caml/finalise.h caml/roots.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/freelist.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/mlvalues.h caml/roots.h caml/weak.h \
+ caml/compact.h
 compare_np.$(O): compare.c caml/custom.h caml/mlvalues.h caml/config.h caml/m.h \
-  caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/mlvalues.h
 custom_np.$(O): custom.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc_ctrl.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/signals.h
+ caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc_ctrl.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/signals.h
 debugger_np.$(O): debugger.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/debugger.h caml/osdeps.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h
+ caml/s.h caml/mlvalues.h caml/config.h caml/debugger.h caml/misc.h \
+ caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 dynlink_np.$(O): dynlink.c caml/config.h caml/m.h caml/s.h caml/alloc.h \
-  caml/misc.h caml/mlvalues.h caml/dynlink.h caml/fail.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/osdeps.h caml/prims.h caml/signals.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/dynlink.h caml/fail.h \
+ caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/misc.h caml/osdeps.h \
+ caml/memory.h caml/prims.h caml/signals.h
 dynlink_nat_np.$(O): dynlink_nat.c caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/stack.h \
-  caml/callback.h caml/alloc.h caml/intext.h caml/io.h caml/osdeps.h \
-  caml/fail.h caml/signals.h caml/hooks.h
+ caml/mlvalues.h caml/misc.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/stack.h caml/callback.h caml/alloc.h caml/intext.h caml/io.h \
+ caml/osdeps.h caml/memory.h caml/fail.h caml/signals.h caml/hooks.h
 extern_np.$(O): extern.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc.h \
-  caml/intext.h caml/io.h caml/md5.h caml/memory.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/reverse.h
+ caml/s.h caml/mlvalues.h caml/config.h caml/custom.h caml/fail.h \
+ caml/gc.h caml/intext.h caml/io.h caml/io.h caml/md5.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/reverse.h
 fail_byt_np.$(O): fail_byt.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/printexc.h caml/signals.h caml/stacks.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/printexc.h \
+ caml/signals.h caml/stacks.h caml/memory.h
 fail_nat_np.$(O): fail_nat.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/printexc.h caml/signals.h caml/stack.h caml/roots.h \
-  caml/callback.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/printexc.h caml/signals.h \
+ caml/stack.h caml/roots.h caml/memory.h caml/callback.h
 finalise_np.$(O): finalise.c caml/callback.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/compact.h caml/fail.h \
-  caml/finalise.h caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/signals.h
+ caml/m.h caml/s.h caml/misc.h caml/compact.h caml/fail.h caml/finalise.h \
+ caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/minor_gc.h caml/mlvalues.h \
+ caml/roots.h caml/signals.h
 fix_code_np.$(O): fix_code.c caml/config.h caml/m.h caml/s.h caml/debugger.h \
-  caml/misc.h caml/mlvalues.h caml/fix_code.h caml/instruct.h \
-  caml/intext.h caml/io.h caml/md5.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/fix_code.h \
+ caml/instruct.h caml/intext.h caml/io.h caml/md5.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/reverse.h
 floats_np.$(O): floats.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h caml/stacks.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/misc.h caml/reverse.h caml/stacks.h caml/memory.h
 freelist_np.$(O): freelist.c caml/config.h caml/m.h caml/s.h caml/freelist.h \
-  caml/misc.h caml/mlvalues.h caml/gc.h caml/gc_ctrl.h caml/memory.h \
-  caml/major_gc.h caml/minor_gc.h caml/address_class.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/gc.h caml/gc_ctrl.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/major_gc.h caml/misc.h caml/mlvalues.h
 gc_ctrl_np.$(O): gc_ctrl.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/compact.h \
-  caml/custom.h caml/fail.h caml/finalise.h caml/roots.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/gc_ctrl.h caml/signals.h caml/stack.h \
-  caml/startup_aux.h
+ caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/compact.h \
+ caml/custom.h caml/fail.h caml/finalise.h caml/roots.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/freelist.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/minor_gc.h caml/misc.h \
+ caml/mlvalues.h caml/signals.h caml/stack.h caml/startup_aux.h
 globroots_np.$(O): globroots.c caml/memory.h caml/config.h caml/m.h caml/s.h \
-  caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/roots.h caml/globroots.h
+ caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/memory.h caml/globroots.h caml/roots.h
 hash_np.$(O): hash.c caml/mlvalues.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/custom.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/hash.h
+ caml/misc.h caml/custom.h caml/mlvalues.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/hash.h
 instrtrace_np.$(O): instrtrace.c
 intern_np.$(O): intern.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/callback.h caml/custom.h caml/fail.h \
-  caml/gc.h caml/intext.h caml/io.h caml/md5.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h
+ caml/s.h caml/mlvalues.h caml/callback.h caml/config.h caml/custom.h \
+ caml/fail.h caml/gc.h caml/intext.h caml/io.h caml/io.h caml/md5.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/misc.h caml/reverse.h
 interp_np.$(O): interp.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/callback.h \
-  caml/debugger.h caml/fail.h caml/fix_code.h caml/instrtrace.h \
-  caml/instruct.h caml/interp.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/prims.h caml/signals.h caml/stacks.h caml/startup_aux.h \
-  caml/jumptbl.h
+ caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/callback.h \
+ caml/debugger.h caml/fail.h caml/fix_code.h caml/instrtrace.h \
+ caml/instruct.h caml/interp.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/prims.h \
+ caml/signals.h caml/stacks.h caml/memory.h caml/startup_aux.h \
+ caml/jumptbl.h
 ints_np.$(O): ints.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/custom.h caml/fail.h caml/intext.h caml/io.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/custom.h caml/fail.h caml/intext.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h
 io_np.$(O): io.c caml/config.h caml/m.h caml/s.h caml/alloc.h caml/misc.h \
-  caml/mlvalues.h caml/custom.h caml/fail.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/osdeps.h caml/signals.h caml/sys.h
+ caml/config.h caml/mlvalues.h caml/custom.h caml/fail.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/osdeps.h \
+ caml/memory.h caml/signals.h caml/sys.h
 lexing_np.$(O): lexing.c caml/fail.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/stacks.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/s.h caml/mlvalues.h caml/mlvalues.h caml/stacks.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 main_np.$(O): main.c caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/sys.h caml/osdeps.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/misc.h caml/sys.h caml/osdeps.h caml/memory.h \
+ caml/gc.h caml/mlvalues.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 major_gc_np.$(O): major_gc.c caml/compact.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/custom.h caml/fail.h caml/finalise.h \
-  caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/gc_ctrl.h caml/signals.h \
-  caml/weak.h
+ caml/misc.h caml/mlvalues.h caml/custom.h caml/config.h caml/fail.h \
+ caml/finalise.h caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/freelist.h \
+ caml/gc.h caml/gc_ctrl.h caml/major_gc.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/signals.h caml/weak.h
 md5_np.$(O): md5.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/md5.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/reverse.h
+ caml/mlvalues.h caml/fail.h caml/md5.h caml/io.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/io.h caml/reverse.h
 memory_np.$(O): memory.c caml/address_class.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/fail.h caml/freelist.h caml/gc.h \
-  caml/gc_ctrl.h caml/major_gc.h caml/memory.h caml/minor_gc.h \
-  caml/signals.h
+ caml/misc.h caml/mlvalues.h caml/config.h caml/fail.h caml/freelist.h \
+ caml/gc.h caml/gc_ctrl.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/signals.h
 meta_np.$(O): meta.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/fix_code.h caml/interp.h \
-  caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
-  caml/gc.h caml/minor_gc.h caml/address_class.h caml/prims.h \
-  caml/stacks.h caml/backtrace_prim.h caml/backtrace.h caml/exec.h
+ caml/mlvalues.h caml/config.h caml/fail.h caml/fix_code.h caml/interp.h \
+ caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/prims.h caml/stacks.h \
+ caml/memory.h caml/backtrace_prim.h caml/backtrace.h caml/exec.h
 minor_gc_np.$(O): minor_gc.c caml/custom.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/fail.h caml/finalise.h caml/roots.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/gc_ctrl.h caml/signals.h \
-  caml/weak.h
-misc_np.$(O): misc.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/memory.h \
-  caml/gc.h caml/mlvalues.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/osdeps.h caml/version.h
+ caml/m.h caml/s.h caml/misc.h caml/config.h caml/fail.h caml/finalise.h \
+ caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/minor_gc.h caml/misc.h \
+ caml/mlvalues.h caml/roots.h caml/signals.h caml/weak.h
+misc_np.$(O): misc.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/config.h \
+ caml/memory.h caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
+ caml/memory.h caml/version.h
 obj_np.$(O): obj.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/gc.h caml/interp.h caml/major_gc.h \
-  caml/freelist.h caml/memory.h caml/minor_gc.h caml/address_class.h \
-  caml/prims.h caml/spacetime.h caml/io.h caml/stack.h
+ caml/mlvalues.h caml/fail.h caml/gc.h caml/interp.h caml/major_gc.h \
+ caml/freelist.h caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/prims.h caml/spacetime.h caml/io.h caml/stack.h
 parsing_np.$(O): parsing.c caml/config.h caml/m.h caml/s.h caml/mlvalues.h \
-  caml/misc.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/alloc.h
+ caml/config.h caml/misc.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/alloc.h
 prims_np.$(O): prims.c caml/mlvalues.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/prims.h
+ caml/misc.h caml/prims.h
 printexc_np.$(O): printexc.c caml/backtrace.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/exec.h caml/callback.h \
-  caml/debugger.h caml/fail.h caml/printexc.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/m.h caml/s.h caml/misc.h caml/exec.h caml/callback.h \
+ caml/debugger.h caml/fail.h caml/misc.h caml/mlvalues.h caml/printexc.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 roots_byt_np.$(O): roots_byt.c caml/finalise.h caml/roots.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h \
-  caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/globroots.h caml/stacks.h
+ caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/globroots.h caml/major_gc.h caml/memory.h caml/minor_gc.h \
+ caml/misc.h caml/mlvalues.h caml/roots.h caml/stacks.h
 roots_nat_np.$(O): roots_nat.c caml/finalise.h caml/roots.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h \
-  caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/globroots.h caml/stack.h
+ caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/globroots.h caml/memory.h caml/major_gc.h caml/minor_gc.h \
+ caml/misc.h caml/mlvalues.h caml/stack.h caml/roots.h
 signals_np.$(O): signals.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/callback.h caml/fail.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/roots.h caml/signals.h \
-  caml/signals_machdep.h caml/sys.h
+ caml/s.h caml/mlvalues.h caml/callback.h caml/config.h caml/fail.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/roots.h \
+ caml/memory.h caml/signals.h caml/signals_machdep.h caml/sys.h
 signals_byt_np.$(O): signals_byt.c caml/config.h caml/m.h caml/s.h \
-  caml/memory.h caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/signals.h caml/signals_machdep.h
+ caml/memory.h caml/config.h caml/gc.h caml/mlvalues.h caml/misc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/signals_machdep.h
 signals_nat_np.$(O): signals_nat.c caml/fail.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/osdeps.h caml/signals.h caml/signals_machdep.h signals_osdep.h \
-  caml/stack.h caml/spacetime.h caml/io.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/signals_machdep.h \
+ signals_osdep.h caml/stack.h caml/spacetime.h caml/io.h caml/stack.h
 spacetime_byt_np.$(O): spacetime_byt.c caml/fail.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/mlvalues.h
 spacetime_nat_np.$(O): spacetime_nat.c caml/config.h caml/m.h caml/s.h \
-  caml/alloc.h caml/misc.h caml/mlvalues.h caml/backtrace_prim.h \
-  caml/backtrace.h caml/exec.h caml/fail.h caml/gc.h caml/intext.h \
-  caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
-  caml/minor_gc.h caml/address_class.h caml/osdeps.h caml/roots.h \
-  caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h
+ caml/alloc.h caml/misc.h caml/config.h caml/mlvalues.h \
+ caml/backtrace_prim.h caml/backtrace.h caml/exec.h caml/fail.h caml/gc.h \
+ caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h \
+ caml/roots.h caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h \
+ caml/stack.h
 spacetime_snapshot_np.$(O): spacetime_snapshot.c caml/alloc.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/mlvalues.h caml/backtrace_prim.h \
-  caml/backtrace.h caml/exec.h caml/custom.h caml/fail.h caml/gc.h \
-  caml/gc_ctrl.h caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/minor_gc.h caml/address_class.h caml/roots.h \
-  caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h
+ caml/config.h caml/m.h caml/s.h caml/mlvalues.h caml/backtrace_prim.h \
+ caml/backtrace.h caml/exec.h caml/config.h caml/custom.h caml/fail.h \
+ caml/gc.h caml/gc_ctrl.h caml/intext.h caml/io.h caml/major_gc.h \
+ caml/freelist.h caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/memory.h caml/signals.h caml/stack.h caml/sys.h \
+ caml/spacetime.h caml/stack.h
 stacks_np.$(O): stacks.c caml/config.h caml/m.h caml/s.h caml/fail.h \
-  caml/misc.h caml/mlvalues.h caml/stacks.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/misc.h caml/mlvalues.h \
+ caml/stacks.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 startup_aux_np.$(O): startup_aux.c caml/backtrace.h caml/mlvalues.h \
-  caml/config.h caml/m.h caml/s.h caml/misc.h caml/exec.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/callback.h caml/osdeps.h caml/startup_aux.h
+ caml/config.h caml/m.h caml/s.h caml/misc.h caml/exec.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/callback.h caml/major_gc.h caml/osdeps.h \
+ caml/memory.h caml/startup_aux.h
 startup_byt_np.$(O): startup_byt.c caml/config.h caml/m.h caml/s.h caml/alloc.h \
-  caml/misc.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
-  caml/callback.h caml/custom.h caml/debugger.h caml/dynlink.h \
-  caml/fail.h caml/fix_code.h caml/freelist.h caml/gc_ctrl.h \
-  caml/instrtrace.h caml/interp.h caml/intext.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
-  caml/osdeps.h caml/prims.h caml/printexc.h caml/reverse.h \
-  caml/signals.h caml/stacks.h caml/sys.h caml/startup.h \
-  caml/startup_aux.h caml/version.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
+ caml/callback.h caml/custom.h caml/debugger.h caml/dynlink.h caml/exec.h \
+ caml/fail.h caml/fix_code.h caml/freelist.h caml/gc_ctrl.h \
+ caml/instrtrace.h caml/interp.h caml/intext.h caml/io.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/osdeps.h caml/memory.h caml/prims.h caml/printexc.h caml/reverse.h \
+ caml/signals.h caml/stacks.h caml/sys.h caml/startup.h \
+ caml/startup_aux.h caml/version.h
 startup_nat_np.$(O): startup_nat.c caml/callback.h caml/mlvalues.h \
-  caml/config.h caml/m.h caml/s.h caml/misc.h caml/backtrace.h \
-  caml/exec.h caml/custom.h caml/debugger.h caml/fail.h caml/freelist.h \
-  caml/gc.h caml/gc_ctrl.h caml/intext.h caml/io.h caml/memory.h \
-  caml/major_gc.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/printexc.h caml/stack.h caml/startup_aux.h caml/sys.h
+ caml/config.h caml/m.h caml/s.h caml/misc.h caml/backtrace.h caml/exec.h \
+ caml/custom.h caml/debugger.h caml/fail.h caml/freelist.h caml/gc.h \
+ caml/gc_ctrl.h caml/intext.h caml/io.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h caml/printexc.h \
+ caml/stack.h caml/startup_aux.h caml/sys.h
 str_np.$(O): str.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/mlvalues.h \
+ caml/misc.h
 sys_np.$(O): sys.c caml/config.h caml/m.h caml/s.h caml/alloc.h caml/misc.h \
-  caml/mlvalues.h caml/debugger.h caml/fail.h caml/gc_ctrl.h caml/io.h \
-  caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/signals.h caml/stacks.h \
-  caml/sys.h caml/version.h caml/callback.h caml/startup_aux.h
+ caml/config.h caml/mlvalues.h caml/debugger.h caml/fail.h caml/gc_ctrl.h \
+ caml/io.h caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/signals.h caml/stacks.h caml/sys.h \
+ caml/version.h caml/callback.h caml/startup_aux.h
 unix_np.$(O): unix.c caml/config.h caml/m.h caml/s.h caml/fail.h caml/misc.h \
-  caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/signals.h caml/sys.h caml/io.h caml/alloc.h
+ caml/config.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/sys.h caml/io.h \
+ caml/alloc.h
 weak_np.$(O): weak.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/weak.h caml/signals.h
-afl_npic.$(O): afl.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/mlvalues.h \
-  caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/fail.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/weak.h caml/minor_gc.h \
+ caml/signals.h
+win32_np.$(O): win32.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
+ caml/mlvalues.h caml/address_class.h caml/fail.h caml/io.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/osdeps.h caml/memory.h \
+ caml/signals.h caml/sys.h caml/config.h
+afl_npic.$(O): afl.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/config.h \
+ caml/mlvalues.h caml/misc.h caml/osdeps.h caml/memory.h caml/gc.h \
+ caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 alloc_npic.$(O): alloc.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/custom.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/stacks.h
+ caml/mlvalues.h caml/custom.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/stacks.h caml/memory.h
 array_npic.$(O): array.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/signals.h \
-  caml/spacetime.h caml/io.h caml/stack.h
+ caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/mlvalues.h caml/signals.h caml/spacetime.h caml/io.h caml/stack.h
 backtrace_npic.$(O): backtrace.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/backtrace.h \
-  caml/exec.h caml/backtrace_prim.h caml/fail.h
+ caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/backtrace.h \
+ caml/exec.h caml/backtrace_prim.h caml/backtrace.h caml/fail.h
 backtrace_byt_npic.$(O): backtrace_byt.c caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/misc.h caml/alloc.h caml/custom.h caml/io.h \
-  caml/instruct.h caml/intext.h caml/exec.h caml/fix_code.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/startup.h caml/stacks.h \
-  caml/sys.h caml/backtrace.h caml/fail.h caml/backtrace_prim.h
+ caml/mlvalues.h caml/config.h caml/misc.h caml/alloc.h caml/mlvalues.h \
+ caml/custom.h caml/io.h caml/instruct.h caml/intext.h caml/io.h \
+ caml/exec.h caml/fix_code.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/startup.h \
+ caml/exec.h caml/stacks.h caml/memory.h caml/sys.h caml/backtrace.h \
+ caml/fail.h caml/backtrace_prim.h caml/backtrace.h
 backtrace_nat_npic.$(O): backtrace_nat.c caml/alloc.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
-  caml/backtrace_prim.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/stack.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
+ caml/backtrace_prim.h caml/backtrace.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/misc.h caml/mlvalues.h caml/stack.h
 bigarray_npic.$(O): bigarray.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/bigarray.h caml/custom.h caml/fail.h \
-  caml/intext.h caml/io.h caml/hash.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/signals.h
+ caml/s.h caml/mlvalues.h caml/bigarray.h caml/custom.h caml/fail.h \
+ caml/intext.h caml/io.h caml/hash.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/signals.h
 callback_npic.$(O): callback.c caml/callback.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/m.h caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h
 clambda_checks_npic.$(O): clambda_checks.c caml/mlvalues.h caml/config.h caml/m.h \
-  caml/s.h caml/misc.h
+ caml/s.h caml/misc.h
 compact_npic.$(O): compact.c caml/address_class.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/finalise.h caml/roots.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/gc_ctrl.h caml/weak.h caml/compact.h
+ caml/misc.h caml/mlvalues.h caml/config.h caml/finalise.h caml/roots.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/freelist.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/mlvalues.h caml/roots.h caml/weak.h \
+ caml/compact.h
 compare_npic.$(O): compare.c caml/custom.h caml/mlvalues.h caml/config.h caml/m.h \
-  caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/s.h caml/misc.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/mlvalues.h
 custom_npic.$(O): custom.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc_ctrl.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/signals.h
+ caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc_ctrl.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/signals.h
 debugger_npic.$(O): debugger.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/debugger.h caml/osdeps.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h
+ caml/s.h caml/mlvalues.h caml/config.h caml/debugger.h caml/misc.h \
+ caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 dynlink_npic.$(O): dynlink.c caml/config.h caml/m.h caml/s.h caml/alloc.h \
-  caml/misc.h caml/mlvalues.h caml/dynlink.h caml/fail.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/osdeps.h caml/prims.h caml/signals.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/dynlink.h caml/fail.h \
+ caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/misc.h caml/osdeps.h \
+ caml/memory.h caml/prims.h caml/signals.h
 dynlink_nat_npic.$(O): dynlink_nat.c caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/stack.h \
-  caml/callback.h caml/alloc.h caml/intext.h caml/io.h caml/osdeps.h \
-  caml/fail.h caml/signals.h caml/hooks.h
+ caml/mlvalues.h caml/misc.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/stack.h caml/callback.h caml/alloc.h caml/intext.h caml/io.h \
+ caml/osdeps.h caml/memory.h caml/fail.h caml/signals.h caml/hooks.h
 extern_npic.$(O): extern.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/custom.h caml/fail.h caml/gc.h \
-  caml/intext.h caml/io.h caml/md5.h caml/memory.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/reverse.h
+ caml/s.h caml/mlvalues.h caml/config.h caml/custom.h caml/fail.h \
+ caml/gc.h caml/intext.h caml/io.h caml/io.h caml/md5.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/reverse.h
 fail_byt_npic.$(O): fail_byt.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/printexc.h caml/signals.h caml/stacks.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/printexc.h \
+ caml/signals.h caml/stacks.h caml/memory.h
 fail_nat_npic.$(O): fail_nat.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/printexc.h caml/signals.h caml/stack.h caml/roots.h \
-  caml/callback.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/io.h caml/gc.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/printexc.h caml/signals.h \
+ caml/stack.h caml/roots.h caml/memory.h caml/callback.h
 finalise_npic.$(O): finalise.c caml/callback.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/compact.h caml/fail.h \
-  caml/finalise.h caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/signals.h
+ caml/m.h caml/s.h caml/misc.h caml/compact.h caml/fail.h caml/finalise.h \
+ caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/minor_gc.h caml/mlvalues.h \
+ caml/roots.h caml/signals.h
 fix_code_npic.$(O): fix_code.c caml/config.h caml/m.h caml/s.h caml/debugger.h \
-  caml/misc.h caml/mlvalues.h caml/fix_code.h caml/instruct.h \
-  caml/intext.h caml/io.h caml/md5.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/fix_code.h \
+ caml/instruct.h caml/intext.h caml/io.h caml/md5.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/reverse.h
 floats_npic.$(O): floats.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h caml/stacks.h
+ caml/s.h caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/misc.h caml/reverse.h caml/stacks.h caml/memory.h
 freelist_npic.$(O): freelist.c caml/config.h caml/m.h caml/s.h caml/freelist.h \
-  caml/misc.h caml/mlvalues.h caml/gc.h caml/gc_ctrl.h caml/memory.h \
-  caml/major_gc.h caml/minor_gc.h caml/address_class.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/gc.h caml/gc_ctrl.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/major_gc.h caml/misc.h caml/mlvalues.h
 gc_ctrl_npic.$(O): gc_ctrl.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/compact.h \
-  caml/custom.h caml/fail.h caml/finalise.h caml/roots.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/gc_ctrl.h caml/signals.h caml/stack.h \
-  caml/startup_aux.h
+ caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/compact.h \
+ caml/custom.h caml/fail.h caml/finalise.h caml/roots.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/freelist.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/minor_gc.h caml/misc.h \
+ caml/mlvalues.h caml/signals.h caml/stack.h caml/startup_aux.h
 globroots_npic.$(O): globroots.c caml/memory.h caml/config.h caml/m.h caml/s.h \
-  caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/roots.h caml/globroots.h
+ caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/memory.h caml/globroots.h caml/roots.h
 hash_npic.$(O): hash.c caml/mlvalues.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/custom.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/hash.h
+ caml/misc.h caml/custom.h caml/mlvalues.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/hash.h
 instrtrace_npic.$(O): instrtrace.c
 intern_npic.$(O): intern.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/callback.h caml/custom.h caml/fail.h \
-  caml/gc.h caml/intext.h caml/io.h caml/md5.h caml/memory.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/reverse.h
+ caml/s.h caml/mlvalues.h caml/callback.h caml/config.h caml/custom.h \
+ caml/fail.h caml/gc.h caml/intext.h caml/io.h caml/io.h caml/md5.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/misc.h caml/reverse.h
 interp_npic.$(O): interp.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/callback.h \
-  caml/debugger.h caml/fail.h caml/fix_code.h caml/instrtrace.h \
-  caml/instruct.h caml/interp.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/prims.h caml/signals.h caml/stacks.h caml/startup_aux.h \
-  caml/jumptbl.h
+ caml/s.h caml/mlvalues.h caml/backtrace.h caml/exec.h caml/callback.h \
+ caml/debugger.h caml/fail.h caml/fix_code.h caml/instrtrace.h \
+ caml/instruct.h caml/interp.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/prims.h \
+ caml/signals.h caml/stacks.h caml/memory.h caml/startup_aux.h \
+ caml/jumptbl.h
 ints_npic.$(O): ints.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/custom.h caml/fail.h caml/intext.h caml/io.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/custom.h caml/fail.h caml/intext.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h
 io_npic.$(O): io.c caml/config.h caml/m.h caml/s.h caml/alloc.h caml/misc.h \
-  caml/mlvalues.h caml/custom.h caml/fail.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/osdeps.h caml/signals.h caml/sys.h
+ caml/config.h caml/mlvalues.h caml/custom.h caml/fail.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/osdeps.h \
+ caml/memory.h caml/signals.h caml/sys.h
 lexing_npic.$(O): lexing.c caml/fail.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/stacks.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/s.h caml/mlvalues.h caml/mlvalues.h caml/stacks.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 main_npic.$(O): main.c caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/sys.h caml/osdeps.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/misc.h caml/sys.h caml/osdeps.h caml/memory.h \
+ caml/gc.h caml/mlvalues.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 major_gc_npic.$(O): major_gc.c caml/compact.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/custom.h caml/fail.h caml/finalise.h \
-  caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/gc_ctrl.h caml/signals.h \
-  caml/weak.h
+ caml/misc.h caml/mlvalues.h caml/custom.h caml/config.h caml/fail.h \
+ caml/finalise.h caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/freelist.h \
+ caml/gc.h caml/gc_ctrl.h caml/major_gc.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/signals.h caml/weak.h
 md5_npic.$(O): md5.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/md5.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/reverse.h
+ caml/mlvalues.h caml/fail.h caml/md5.h caml/io.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/mlvalues.h caml/io.h caml/reverse.h
 memory_npic.$(O): memory.c caml/address_class.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/mlvalues.h caml/fail.h caml/freelist.h caml/gc.h \
-  caml/gc_ctrl.h caml/major_gc.h caml/memory.h caml/minor_gc.h \
-  caml/signals.h
+ caml/misc.h caml/mlvalues.h caml/config.h caml/fail.h caml/freelist.h \
+ caml/gc.h caml/gc_ctrl.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/signals.h
 meta_npic.$(O): meta.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/fix_code.h caml/interp.h \
-  caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
-  caml/gc.h caml/minor_gc.h caml/address_class.h caml/prims.h \
-  caml/stacks.h caml/backtrace_prim.h caml/backtrace.h caml/exec.h
+ caml/mlvalues.h caml/config.h caml/fail.h caml/fix_code.h caml/interp.h \
+ caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/prims.h caml/stacks.h \
+ caml/memory.h caml/backtrace_prim.h caml/backtrace.h caml/exec.h
 minor_gc_npic.$(O): minor_gc.c caml/custom.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/fail.h caml/finalise.h caml/roots.h \
-  caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/gc_ctrl.h caml/signals.h \
-  caml/weak.h
-misc_npic.$(O): misc.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/memory.h \
-  caml/gc.h caml/mlvalues.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/osdeps.h caml/version.h
+ caml/m.h caml/s.h caml/misc.h caml/config.h caml/fail.h caml/finalise.h \
+ caml/roots.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h caml/gc.h caml/gc_ctrl.h \
+ caml/major_gc.h caml/memory.h caml/minor_gc.h caml/misc.h \
+ caml/mlvalues.h caml/roots.h caml/signals.h caml/weak.h
+misc_npic.$(O): misc.c caml/config.h caml/m.h caml/s.h caml/misc.h caml/config.h \
+ caml/memory.h caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
+ caml/memory.h caml/version.h
 obj_npic.$(O): obj.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/gc.h caml/interp.h caml/major_gc.h \
-  caml/freelist.h caml/memory.h caml/minor_gc.h caml/address_class.h \
-  caml/prims.h caml/spacetime.h caml/io.h caml/stack.h
+ caml/mlvalues.h caml/fail.h caml/gc.h caml/interp.h caml/major_gc.h \
+ caml/freelist.h caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/prims.h caml/spacetime.h caml/io.h caml/stack.h
 parsing_npic.$(O): parsing.c caml/config.h caml/m.h caml/s.h caml/mlvalues.h \
-  caml/misc.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/alloc.h
+ caml/config.h caml/misc.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/alloc.h
 prims_npic.$(O): prims.c caml/mlvalues.h caml/config.h caml/m.h caml/s.h \
-  caml/misc.h caml/prims.h
+ caml/misc.h caml/prims.h
 printexc_npic.$(O): printexc.c caml/backtrace.h caml/mlvalues.h caml/config.h \
-  caml/m.h caml/s.h caml/misc.h caml/exec.h caml/callback.h \
-  caml/debugger.h caml/fail.h caml/printexc.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/m.h caml/s.h caml/misc.h caml/exec.h caml/callback.h \
+ caml/debugger.h caml/fail.h caml/misc.h caml/mlvalues.h caml/printexc.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h
 roots_byt_npic.$(O): roots_byt.c caml/finalise.h caml/roots.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h \
-  caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/globroots.h caml/stacks.h
+ caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/globroots.h caml/major_gc.h caml/memory.h caml/minor_gc.h \
+ caml/misc.h caml/mlvalues.h caml/roots.h caml/stacks.h
 roots_nat_npic.$(O): roots_nat.c caml/finalise.h caml/roots.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h \
-  caml/mlvalues.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/globroots.h caml/stack.h
+ caml/config.h caml/m.h caml/s.h caml/memory.h caml/gc.h caml/mlvalues.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/globroots.h caml/memory.h caml/major_gc.h caml/minor_gc.h \
+ caml/misc.h caml/mlvalues.h caml/stack.h caml/roots.h
 signals_npic.$(O): signals.c caml/alloc.h caml/misc.h caml/config.h caml/m.h \
-  caml/s.h caml/mlvalues.h caml/callback.h caml/fail.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/roots.h caml/signals.h \
-  caml/signals_machdep.h caml/sys.h
+ caml/s.h caml/mlvalues.h caml/callback.h caml/config.h caml/fail.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/mlvalues.h caml/roots.h \
+ caml/memory.h caml/signals.h caml/signals_machdep.h caml/sys.h
 signals_byt_npic.$(O): signals_byt.c caml/config.h caml/m.h caml/s.h \
-  caml/memory.h caml/gc.h caml/mlvalues.h caml/misc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/signals.h caml/signals_machdep.h
+ caml/memory.h caml/config.h caml/gc.h caml/mlvalues.h caml/misc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/signals_machdep.h
 signals_nat_npic.$(O): signals_nat.c caml/fail.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
-  caml/osdeps.h caml/signals.h caml/signals_machdep.h signals_osdep.h \
-  caml/stack.h caml/spacetime.h caml/io.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/signals_machdep.h \
+ signals_osdep.h caml/stack.h caml/spacetime.h caml/io.h caml/stack.h
 spacetime_byt_npic.$(O): spacetime_byt.c caml/fail.h caml/misc.h caml/config.h \
-  caml/m.h caml/s.h caml/mlvalues.h
+ caml/m.h caml/s.h caml/mlvalues.h caml/mlvalues.h
 spacetime_nat_npic.$(O): spacetime_nat.c caml/config.h caml/m.h caml/s.h \
-  caml/alloc.h caml/misc.h caml/mlvalues.h caml/backtrace_prim.h \
-  caml/backtrace.h caml/exec.h caml/fail.h caml/gc.h caml/intext.h \
-  caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
-  caml/minor_gc.h caml/address_class.h caml/osdeps.h caml/roots.h \
-  caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h
+ caml/alloc.h caml/misc.h caml/config.h caml/mlvalues.h \
+ caml/backtrace_prim.h caml/backtrace.h caml/exec.h caml/fail.h caml/gc.h \
+ caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
+ caml/minor_gc.h caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h \
+ caml/roots.h caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h \
+ caml/stack.h
 spacetime_snapshot_npic.$(O): spacetime_snapshot.c caml/alloc.h caml/misc.h \
-  caml/config.h caml/m.h caml/s.h caml/mlvalues.h caml/backtrace_prim.h \
-  caml/backtrace.h caml/exec.h caml/custom.h caml/fail.h caml/gc.h \
-  caml/gc_ctrl.h caml/intext.h caml/io.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/minor_gc.h caml/address_class.h caml/roots.h \
-  caml/signals.h caml/stack.h caml/sys.h caml/spacetime.h
+ caml/config.h caml/m.h caml/s.h caml/mlvalues.h caml/backtrace_prim.h \
+ caml/backtrace.h caml/exec.h caml/config.h caml/custom.h caml/fail.h \
+ caml/gc.h caml/gc_ctrl.h caml/intext.h caml/io.h caml/major_gc.h \
+ caml/freelist.h caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/roots.h caml/memory.h caml/signals.h caml/stack.h caml/sys.h \
+ caml/spacetime.h caml/stack.h
 stacks_npic.$(O): stacks.c caml/config.h caml/m.h caml/s.h caml/fail.h \
-  caml/misc.h caml/mlvalues.h caml/stacks.h caml/memory.h caml/gc.h \
-  caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/misc.h caml/mlvalues.h \
+ caml/stacks.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
+ caml/minor_gc.h caml/address_class.h
 startup_aux_npic.$(O): startup_aux.c caml/backtrace.h caml/mlvalues.h \
-  caml/config.h caml/m.h caml/s.h caml/misc.h caml/exec.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
-  caml/address_class.h caml/callback.h caml/osdeps.h caml/startup_aux.h
+ caml/config.h caml/m.h caml/s.h caml/misc.h caml/exec.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/callback.h caml/major_gc.h caml/osdeps.h \
+ caml/memory.h caml/startup_aux.h
 startup_byt_npic.$(O): startup_byt.c caml/config.h caml/m.h caml/s.h caml/alloc.h \
-  caml/misc.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
-  caml/callback.h caml/custom.h caml/debugger.h caml/dynlink.h \
-  caml/fail.h caml/fix_code.h caml/freelist.h caml/gc_ctrl.h \
-  caml/instrtrace.h caml/interp.h caml/intext.h caml/io.h caml/memory.h \
-  caml/gc.h caml/major_gc.h caml/minor_gc.h caml/address_class.h \
-  caml/osdeps.h caml/prims.h caml/printexc.h caml/reverse.h \
-  caml/signals.h caml/stacks.h caml/sys.h caml/startup.h \
-  caml/startup_aux.h caml/version.h
+ caml/misc.h caml/config.h caml/mlvalues.h caml/backtrace.h caml/exec.h \
+ caml/callback.h caml/custom.h caml/debugger.h caml/dynlink.h caml/exec.h \
+ caml/fail.h caml/fix_code.h caml/freelist.h caml/gc_ctrl.h \
+ caml/instrtrace.h caml/interp.h caml/intext.h caml/io.h caml/io.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/minor_gc.h caml/misc.h caml/mlvalues.h \
+ caml/osdeps.h caml/memory.h caml/prims.h caml/printexc.h caml/reverse.h \
+ caml/signals.h caml/stacks.h caml/sys.h caml/startup.h \
+ caml/startup_aux.h caml/version.h
 startup_nat_npic.$(O): startup_nat.c caml/callback.h caml/mlvalues.h \
-  caml/config.h caml/m.h caml/s.h caml/misc.h caml/backtrace.h \
-  caml/exec.h caml/custom.h caml/debugger.h caml/fail.h caml/freelist.h \
-  caml/gc.h caml/gc_ctrl.h caml/intext.h caml/io.h caml/memory.h \
-  caml/major_gc.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/printexc.h caml/stack.h caml/startup_aux.h caml/sys.h
+ caml/config.h caml/m.h caml/s.h caml/misc.h caml/backtrace.h caml/exec.h \
+ caml/custom.h caml/debugger.h caml/fail.h caml/freelist.h caml/gc.h \
+ caml/gc_ctrl.h caml/intext.h caml/io.h caml/memory.h caml/gc.h \
+ caml/major_gc.h caml/freelist.h caml/minor_gc.h caml/address_class.h \
+ caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h caml/printexc.h \
+ caml/stack.h caml/startup_aux.h caml/sys.h
 str_npic.$(O): str.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h
+ caml/mlvalues.h caml/fail.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/mlvalues.h \
+ caml/misc.h
 sys_npic.$(O): sys.c caml/config.h caml/m.h caml/s.h caml/alloc.h caml/misc.h \
-  caml/mlvalues.h caml/debugger.h caml/fail.h caml/gc_ctrl.h caml/io.h \
-  caml/osdeps.h caml/memory.h caml/gc.h caml/major_gc.h caml/freelist.h \
-  caml/minor_gc.h caml/address_class.h caml/signals.h caml/stacks.h \
-  caml/sys.h caml/version.h caml/callback.h caml/startup_aux.h
+ caml/config.h caml/mlvalues.h caml/debugger.h caml/fail.h caml/gc_ctrl.h \
+ caml/io.h caml/misc.h caml/mlvalues.h caml/osdeps.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/signals.h caml/stacks.h caml/sys.h \
+ caml/version.h caml/callback.h caml/startup_aux.h
 unix_npic.$(O): unix.c caml/config.h caml/m.h caml/s.h caml/fail.h caml/misc.h \
-  caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
-  caml/freelist.h caml/minor_gc.h caml/address_class.h caml/osdeps.h \
-  caml/signals.h caml/sys.h caml/io.h caml/alloc.h
+ caml/config.h caml/mlvalues.h caml/memory.h caml/gc.h caml/major_gc.h \
+ caml/freelist.h caml/minor_gc.h caml/address_class.h caml/misc.h \
+ caml/osdeps.h caml/memory.h caml/signals.h caml/sys.h caml/io.h \
+ caml/alloc.h
 weak_npic.$(O): weak.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
-  caml/mlvalues.h caml/fail.h caml/major_gc.h caml/freelist.h \
-  caml/memory.h caml/gc.h caml/minor_gc.h caml/address_class.h \
-  caml/weak.h caml/signals.h
+ caml/mlvalues.h caml/fail.h caml/major_gc.h caml/freelist.h \
+ caml/memory.h caml/gc.h caml/major_gc.h caml/minor_gc.h \
+ caml/address_class.h caml/mlvalues.h caml/weak.h caml/minor_gc.h \
+ caml/signals.h
+win32_npic.$(O): win32.c caml/alloc.h caml/misc.h caml/config.h caml/m.h caml/s.h \
+ caml/mlvalues.h caml/address_class.h caml/fail.h caml/io.h caml/memory.h \
+ caml/gc.h caml/major_gc.h caml/freelist.h caml/minor_gc.h \
+ caml/address_class.h caml/misc.h caml/osdeps.h caml/memory.h \
+ caml/signals.h caml/sys.h caml/config.h

diff --git a/runtime/caml/io.h b/runtime/caml/io.h
index 87de679e53ce7325eac7136715e2876b9fea06ec..2d961f9565d4fa04b747e421a8a71e35ed0634ee 100644 (file)
--- a/runtime/caml/io.h
+++ b/runtime/caml/io.h
@@ -29,11 +29,9 @@
 
 #if defined(_WIN32)
 typedef __int64 file_offset;
-#elif defined(HAS_OFF_T)
+#else
 #include <sys/types.h>
 typedef off_t file_offset;
-#else
-typedef long file_offset;
 #endif
 
 struct channel {

diff --git a/stdlib/bigarray.mli b/stdlib/bigarray.mli
index 2c1261212e35538790250d1126706f40b07b9916..ea26f66f54ad3e53881c8cd04a57b97807e33555 100644 (file)
--- a/stdlib/bigarray.mli
+++ b/stdlib/bigarray.mli
@@ -133,7 +133,7 @@ type ('a, 'b) kind =
    of OCaml types with element kinds, and are re-exported below for
    backward-compatibility reasons.
 
-   Using a generalized algebraic datatype (GADT) here allows to write
+   Using a generalized algebraic datatype (GADT) here allows writing
    well-typed polymorphic functions whose return type depend on the
    argument type, such as:
 

diff --git a/stdlib/bool.mli b/stdlib/bool.mli
index 975afe3f08432b31d36715e7b25e6330df626b0b..f45caacbe779f678aec70395ca09480ae8fcb8b5 100644 (file)
--- a/stdlib/bool.mli
+++ b/stdlib/bool.mli
@@ -19,7 +19,7 @@
 
 (** {1:bools Booleans} *)
 
-type t = bool = false | true
+type t = bool = false | true (**)
 (** The type of booleans (truth values).
 
     The constructors [false] and [true] are included here so that they have

diff --git a/stdlib/filename.mli b/stdlib/filename.mli
index b05ad0d2e7bfc8346801ac2423b6221c7a811927..9221c9ef50d9ed5e7f49bd68f563e57410e97d58 100644 (file)
--- a/stdlib/filename.mli
+++ b/stdlib/filename.mli
@@ -52,8 +52,8 @@ val check_suffix : string -> string -> bool
 val chop_suffix : string -> string -> string
 (** [chop_suffix name suff] removes the suffix [suff] from
    the filename [name]. The behavior is undefined if [name] does not
-   end with the suffix [suff]. It is thus recommmended to use
-   [chop_suffix_opt] instead.
+   end with the suffix [suff]. [chop_suffix_opt] is thus recommended
+   instead.
 *)
 
 val chop_suffix_opt: suffix:string -> string -> string option

diff --git a/stdlib/float.mli b/stdlib/float.mli
index 70d6ab8a46a7e1372d240adac32366a7fce29d67..f82947b189f9f9e3229362cb97cb06c9bebdac10 100644 (file)
--- a/stdlib/float.mli
+++ b/stdlib/float.mli
@@ -550,7 +550,7 @@ module Array : sig
       function.  The comparison function must return 0 if its arguments
       compare as equal, a positive integer if the first is greater,
       and a negative integer if the first is smaller (see below for a
-      complete specification).  For example, {!Pervasives.compare} is
+      complete specification).  For example, {!Stdlib.compare} is
       a suitable comparison function.  After calling [sort], the
       array is sorted in place in increasing order.
       [sort] is guaranteed to run in constant heap space

diff --git a/stdlib/format.ml b/stdlib/format.ml
index ae1f3c6474368bee04224c9e4cad3b18c8c07976..369c50c36a54874683bb3e2a7378f130d1cad49c 100644 (file)
--- a/stdlib/format.ml
+++ b/stdlib/format.ml
@@ -687,7 +687,7 @@ let pp_print_if_newline state () =
       { size = Size.zero; token = Pp_if_newline; length = 0 }
 
 
-(* Generalized break hint that allows to print strings before/after
+(* Generalized break hint that allows printing strings before/after
    same-line offset (width) or new-line offset *)
 let pp_print_custom_break state ~fits ~breaks =
   let before, width, after = fits in

diff --git a/stdlib/fun.mli b/stdlib/fun.mli
index 202e4c2343cdd1b05e1f02e449db3d3ea33aacc4..32eff8b265558e08a2ff4b725e5afdbfe36a700d 100644 (file)
--- a/stdlib/fun.mli
+++ b/stdlib/fun.mli
@@ -17,7 +17,7 @@
 
     @since 4.08 *)
 
-(** {1 Combinators} *)
+(** {1:combinators Combinators} *)
 
 external id : 'a -> 'a = "%identity"
 (** [id] is the identity function. For any argument [x], [id x] is [x]. *)
@@ -34,7 +34,7 @@ val negate : ('a -> bool) -> ('a -> bool)
 (** [negate p] is the negation of the predicate function [p]. For any
     argument [x], [(negate p) x] is [not (p x)]. *)
 
-(** {1 Exception handling} *)
+(** {1:exception Exception handling} *)
 
 val protect : finally:(unit -> unit) -> (unit -> 'a) -> 'a
 (** [protect ~finally work] invokes [work ()] and then [finally ()]
@@ -43,8 +43,8 @@ val protect : finally:(unit -> unit) -> (unit -> 'a) -> 'a
     [finally ()] raises an exception, then the exception
     {!Finally_raised} is raised instead.
 
-    [protect] can be used to enforce local invariants whether [work
-    ()] returns normally or raises an exception. However, it does not
+    [protect] can be used to enforce local invariants whether [work ()]
+    returns normally or raises an exception. However, it does not
     protect against unexpected exceptions raised inside [finally ()]
     such as {!Stdlib.Out_of_memory}, {!Stdlib.Stack_overflow}, or
     asynchronous exceptions raised by signal handlers

diff --git a/stdlib/list.mli b/stdlib/list.mli
index ad58b7d661c512f28ebea5ac9ada19eb88e0c2f3..d0250afde92d1b707816a2565628875fa4e58ff3 100644 (file)
--- a/stdlib/list.mli
+++ b/stdlib/list.mli
@@ -26,7 +26,7 @@
    longer than about 10000 elements.
 *)
 
-type 'a t = 'a list = [] | (::) of 'a * 'a list
+type 'a t = 'a list = [] | (::) of 'a * 'a list (**)
 (** An alias for the type of lists. *)
 
 val length : 'a list -> int

diff --git a/stdlib/listLabels.mli b/stdlib/listLabels.mli
index 7ea911b6569fbdf6454aaeab5715d0fa3cd455aa..2fc4780ff3a17028886f047e73898bf372d99dd3 100644 (file)
--- a/stdlib/listLabels.mli
+++ b/stdlib/listLabels.mli
@@ -13,7 +13,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-type 'a t = 'a list = [] | (::) of 'a * 'a list
+type 'a t = 'a list = [] | (::) of 'a * 'a list (**)
 (** An alias for the type of lists. *)
 
 (** List operations.

diff --git a/stdlib/option.mli b/stdlib/option.mli
index 7659dbc27fc3271079a075fe7b4901379415a9df..01b665fca3cec53aec5e54ef6ae82341c3c79a53 100644 (file)
--- a/stdlib/option.mli
+++ b/stdlib/option.mli
@@ -21,7 +21,7 @@
 
 (** {1:options Options} *)
 
-type 'a t = 'a option = None | Some of 'a
+type 'a t = 'a option = None | Some of 'a (**)
 (** The type for option values. Either [None] or a value [Some v]. *)
 
 val none : 'a option
@@ -37,8 +37,7 @@ val get : 'a option -> 'a
 (** [get o] is [v] if [o] is [Some v] and @raise Invalid_argument otherwise. *)
 
 val bind : 'a option -> ('a -> 'b option) -> 'b option
-(** [bind o f] is [Some (f v)] if [o] is [Some v] and [None] if [o] is
-    [None]. *)
+(** [bind o f] is [f v] if [o] is [Some v] and [None] if [o] is [None]. *)
 
 val join : 'a option option -> 'a option
 (** [join oo] is [Some v] if [oo] is [Some (Some v)] and [None] otherwise. *)

diff --git a/stdlib/result.mli b/stdlib/result.mli
index c05d25c6e1f837cf0b96c2d9450daec111efed16..96f85dc4eb5327b0ad5722f2e46c59d0bdecf008 100644 (file)
--- a/stdlib/result.mli
+++ b/stdlib/result.mli
@@ -22,7 +22,7 @@
 
 (** {1:results Results} *)
 
-type ('a, 'e) t = ('a, 'e) result = Ok of 'a | Error of 'e
+type ('a, 'e) t = ('a, 'e) result = Ok of 'a | Error of 'e (**)
 (** The type for result values. Either a value [Ok v] or an error [Error e]. *)
 
 val ok : 'a -> ('a, 'e) result

diff --git a/testsuite/tests/lib-dynlink-packed/a.ml b/testsuite/tests/lib-dynlink-packed/a.ml
new file mode 100644 (file)
index 0000000..c8572c9
--- /dev/null
+++ b/testsuite/tests/lib-dynlink-packed/a.ml
@@ -0,0 +1 @@
+let nums = Sys.opaque_identity [1; 2; 3; 4; 5]

diff --git a/testsuite/tests/lib-dynlink-packed/b.ml b/testsuite/tests/lib-dynlink-packed/b.ml
new file mode 100644 (file)
index 0000000..5044f57
--- /dev/null
+++ b/testsuite/tests/lib-dynlink-packed/b.ml
@@ -0,0 +1 @@
+let () = List.iter (fun i -> print_endline (string_of_int i)) A.nums

diff --git a/testsuite/tests/lib-dynlink-packed/byte.reference b/testsuite/tests/lib-dynlink-packed/byte.reference
new file mode 100644 (file)
index 0000000..8a1218a
--- /dev/null
+++ b/testsuite/tests/lib-dynlink-packed/byte.reference
@@ -0,0 +1,5 @@
+1
+2
+3
+4
+5

diff --git a/testsuite/tests/lib-dynlink-packed/loader.ml b/testsuite/tests/lib-dynlink-packed/loader.ml
new file mode 100644 (file)
index 0000000..25b078d
--- /dev/null
+++ b/testsuite/tests/lib-dynlink-packed/loader.ml
@@ -0,0 +1,64 @@
+(* TEST
+
+include dynlink
+libraries = ""
+files = "a.ml b.ml loader.ml"
+
+* shared-libraries
+** setup-ocamlc.byte-build-env
+*** ocamlc.byte
+flags = "-for-pack Packed"
+module = "a.ml"
+*** ocamlc.byte
+flags = "-for-pack Packed"
+module = "b.ml"
+*** ocamlc.byte
+program = "packed.cmo"
+flags = "-pack"
+all_modules = "a.cmo b.cmo"
+*** ocamlc.byte
+program = "${test_build_directory}/loader.byte"
+flags = "-linkall"
+include ocamlcommon
+libraries += "dynlink"
+all_modules = "loader.ml"
+**** run
+arguments = "packed.cmo"
+exit_status = "0"
+***** check-program-output
+reference = "${test_source_directory}/byte.reference"
+
+** native-dynlink
+*** setup-ocamlopt.byte-build-env
+**** ocamlopt.byte
+flags = "-for-pack Packed"
+module = "a.ml"
+**** ocamlopt.byte
+flags = "-for-pack Packed"
+module = "b.ml"
+**** ocamlopt.byte
+program = "packed.cmx"
+flags = "-pack"
+all_modules = "a.cmx b.cmx"
+**** ocamlopt.byte
+program = "plugin.cmxs"
+flags = "-shared"
+all_modules = "packed.cmx"
+**** ocamlopt.byte
+program = "${test_build_directory}/loader.exe"
+flags = "-linkall"
+include ocamlcommon
+libraries += "dynlink"
+all_modules = "loader.ml"
+***** run
+arguments = "plugin.cmxs"
+exit_status = "0"
+****** check-program-output
+reference = "${test_source_directory}/native.reference"
+*)
+let () =
+  try
+    Dynlink.loadfile Sys.argv.(1)
+  with
+  | Dynlink.Error error ->
+    prerr_endline (Dynlink.error_message error)

diff --git a/testsuite/tests/lib-dynlink-packed/native.reference b/testsuite/tests/lib-dynlink-packed/native.reference
new file mode 100644 (file)
index 0000000..8a1218a
--- /dev/null
+++ b/testsuite/tests/lib-dynlink-packed/native.reference
@@ -0,0 +1,5 @@
+1
+2
+3
+4
+5

diff --git a/testsuite/tests/lib-dynlink-packed/ocamltests b/testsuite/tests/lib-dynlink-packed/ocamltests
new file mode 100644 (file)
index 0000000..0fe19df
--- /dev/null
+++ b/testsuite/tests/lib-dynlink-packed/ocamltests
@@ -0,0 +1 @@
+loader.ml

diff --git a/testsuite/tests/lib-str/t01.ml b/testsuite/tests/lib-str/t01.ml
index 87621c15fd71f155c8e9a3094d10017d565d8403..076172bdcb9533027119419b25e8b0e9a07048e9 100644 (file)
--- a/testsuite/tests/lib-str/t01.ml
+++ b/testsuite/tests/lib-str/t01.ml
@@ -1,6 +1,8 @@
 (* TEST
-   * hasstr
-   include str
+* hasstr
+include str
+** bytecode
+** native
 *)
 
 open Printf

diff --git a/testsuite/tests/lib-threads/backtrace_threads.ml b/testsuite/tests/lib-threads/backtrace_threads.ml
index 96b99e146d93d369c6345838c20ccc64c7dd0516..3c112d610e9070e7e1d286196b27108d026ab612 100644 (file)
--- a/testsuite/tests/lib-threads/backtrace_threads.ml
+++ b/testsuite/tests/lib-threads/backtrace_threads.ml
@@ -2,6 +2,8 @@
 
 * hassysthreads
 include systhreads
+** bytecode
+** native
 
 *)
 

diff --git a/testsuite/tests/lib-threads/bank.ml b/testsuite/tests/lib-threads/bank.ml
index 09e9a70bfde8f6ae60ae6ae6451998e38fa27b13..c06736ea3359834da089f7e8f8cc56b5b6a16b40 100644 (file)
--- a/testsuite/tests/lib-threads/bank.ml
+++ b/testsuite/tests/lib-threads/bank.ml
@@ -2,6 +2,8 @@
 
 * hassysthreads
 include systhreads
+** bytecode
+** native
 
 *)
 

diff --git a/testsuite/tests/lib-threads/beat.ml b/testsuite/tests/lib-threads/beat.ml
index e77c0a863982ed541561f11460a4ee232b6bbe14..1bf88332d39109a73cd102ceb8661771f32a9243 100644 (file)
--- a/testsuite/tests/lib-threads/beat.ml
+++ b/testsuite/tests/lib-threads/beat.ml
@@ -2,6 +2,8 @@
 
 * hassysthreads
 include systhreads
+** bytecode
+** native
 
 *)
 

diff --git a/testsuite/tests/lib-threads/bufchan.ml b/testsuite/tests/lib-threads/bufchan.ml
index eadc61bf7606d773e0f6af4c6b0a45bd3410548f..a1929f32a6ae702588df0f11ab1c42ecb0046cd4 100644 (file)
--- a/testsuite/tests/lib-threads/bufchan.ml
+++ b/testsuite/tests/lib-threads/bufchan.ml
@@ -2,6 +2,8 @@
 
 * hassysthreads
 include systhreads
+** bytecode
+** native
 
 *)
 

diff --git a/testsuite/tests/lib-threads/close.ml b/testsuite/tests/lib-threads/close.ml
index 63e3a17822bc33f6cb6bcbf6fb1abc0afc00c4c6..10f553a6b33f630bd1a5d7cb6737895d3a55010d 100644 (file)
--- a/testsuite/tests/lib-threads/close.ml
+++ b/testsuite/tests/lib-threads/close.ml
@@ -2,6 +2,8 @@
 
 * hassysthreads
 include systhreads
+** bytecode
+** native
 
 *)
 

diff --git a/testsuite/tests/lib-threads/fileio.ml b/testsuite/tests/lib-threads/fileio.ml
index 6bf90b99d7cf99584766f929edcf329d5e7fc630..596721c42c40930011910c32deb0314516e30833 100644 (file)
--- a/testsuite/tests/lib-threads/fileio.ml
+++ b/testsuite/tests/lib-threads/fileio.ml
@@ -2,6 +2,8 @@
 
 * hassysthreads
 include systhreads
+** bytecode
+** native
 
 *)
 

diff --git a/testsuite/tests/lib-threads/pr5325.ml b/testsuite/tests/lib-threads/pr5325.ml
index 69f1577446d99f9633db39f309a6ad11468ee4d4..9f27f038fddb7dfe33a8abe7d95c29575463f56e 100644 (file)
--- a/testsuite/tests/lib-threads/pr5325.ml
+++ b/testsuite/tests/lib-threads/pr5325.ml
@@ -2,6 +2,8 @@
 
 * hassysthreads
 include systhreads
+** bytecode
+** native
 
 *)
 

diff --git a/testsuite/tests/lib-threads/pr7638.ml b/testsuite/tests/lib-threads/pr7638.ml
index 3003d93db2b034f4761a6f76fb359e8260f5bb0e..3bb379f4a3d663e515aae5f72d2e3279fbfc11d0 100644 (file)
--- a/testsuite/tests/lib-threads/pr7638.ml
+++ b/testsuite/tests/lib-threads/pr7638.ml
@@ -2,6 +2,8 @@
 
 * hassysthreads
 include systhreads
+** bytecode
+** native
 
 *)
 

diff --git a/testsuite/tests/lib-threads/prodcons.ml b/testsuite/tests/lib-threads/prodcons.ml
index 93b99ce2b99ea92144da9d34c178915f5893f298..4867ed38d1a59434bfdf611edb2a4e857d87a5a3 100644 (file)
--- a/testsuite/tests/lib-threads/prodcons.ml
+++ b/testsuite/tests/lib-threads/prodcons.ml
@@ -2,6 +2,8 @@
 
 * hassysthreads
 include systhreads
+** bytecode
+** native
 
 *)
 

diff --git a/testsuite/tests/lib-threads/prodcons2.ml b/testsuite/tests/lib-threads/prodcons2.ml
index 58eb82103d1d5a2ff4a6a4e77a474cda5462a2db..308fcd5151af3f0f3047fdbeaee2bb9c2a6fa956 100644 (file)
--- a/testsuite/tests/lib-threads/prodcons2.ml
+++ b/testsuite/tests/lib-threads/prodcons2.ml
@@ -2,6 +2,8 @@
 
 * hassysthreads
 include systhreads
+** bytecode
+** native
 
 *)
 

diff --git a/testsuite/tests/lib-threads/sieve.ml b/testsuite/tests/lib-threads/sieve.ml
index b44b0902d412e75b99e6caadf64987f0a8fa1c76..71d7f62ece5af1e452702bc4bba96b318c620be8 100644 (file)
--- a/testsuite/tests/lib-threads/sieve.ml
+++ b/testsuite/tests/lib-threads/sieve.ml
@@ -2,6 +2,8 @@
 
 * hassysthreads
 include systhreads
+** bytecode
+** native
 
 *)
 

diff --git a/testsuite/tests/lib-threads/swapchan.ml b/testsuite/tests/lib-threads/swapchan.ml
index 853b1a208ab0d5ee64607113d966cb3ac6a8b6b5..3536b82e2e76ba432e14f910c745b264d479c438 100644 (file)
--- a/testsuite/tests/lib-threads/swapchan.ml
+++ b/testsuite/tests/lib-threads/swapchan.ml
@@ -2,6 +2,8 @@
 
 * hassysthreads
 include systhreads
+** bytecode
+** native
 
 *)
 

diff --git a/testsuite/tests/lib-threads/tls.ml b/testsuite/tests/lib-threads/tls.ml
index ef4fc516f1adeaaf2f383d8a0450c553bfe61e80..2741f7ef0b9137a642285ba5ba62227cabb72949 100644 (file)
--- a/testsuite/tests/lib-threads/tls.ml
+++ b/testsuite/tests/lib-threads/tls.ml
@@ -2,6 +2,8 @@
 
 * hassysthreads
 include systhreads
+** bytecode
+** native
 
 *)
 

diff --git a/testsuite/tests/lib-threads/torture.ml b/testsuite/tests/lib-threads/torture.ml
index a96314f909d47f568c0cd82546cf1b7eba7881e5..7131b9cad25d9d03e025fce5c19658dd750d72e6 100644 (file)
--- a/testsuite/tests/lib-threads/torture.ml
+++ b/testsuite/tests/lib-threads/torture.ml
@@ -2,6 +2,8 @@
 
 * hassysthreads
 include systhreads
+** bytecode
+** native
 
 *)
 

diff --git a/testsuite/tests/lib-unix/common/cloexec.ml b/testsuite/tests/lib-unix/common/cloexec.ml
index 5b5f569335f3ed5e9995a0f13d6315da46c6acd6..a62eda6f3ef805368354402b132cfe0016819d88 100644 (file)
--- a/testsuite/tests/lib-unix/common/cloexec.ml
+++ b/testsuite/tests/lib-unix/common/cloexec.ml
@@ -18,7 +18,7 @@
 include unix
 files = "fdstatus_aux.c fdstatus_main.ml"
 
-**libunix
+** libunix
 *** setup-ocamlc.byte-build-env
 program = "${test_build_directory}/cloexec.byte"
 **** ocamlc.byte

diff --git a/testsuite/tests/parsetree/source.ml b/testsuite/tests/parsetree/source.ml
index c67012e18be3e74328d0e2845a0873dd001b26f9..a183f448215c1de71141115058dab791c1cd5901 100644 (file)
--- a/testsuite/tests/parsetree/source.ml
+++ b/testsuite/tests/parsetree/source.ml
@@ -3072,7 +3072,7 @@ Error: Types marked with the immediate attribute must be
        non-pointer types like int or bool
 |}];;
 (*
-   Implicit unpack allows to omit the signature in (val ...) expressions.
+   Implicit unpack allows the signature in (val ...) expressions to be omitted.
 
    It also adds (module M : S) and (module M) patterns, relying on
    implicit (val ...) for the implementation. Such patterns can only

diff --git a/testsuite/tests/regression/pr8769/fortuna.ml b/testsuite/tests/regression/pr8769/fortuna.ml
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/testsuite/tests/regression/pr8769/nocrypto.mli b/testsuite/tests/regression/pr8769/nocrypto.mli
new file mode 100644 (file)
index 0000000..94301b5
--- /dev/null
+++ b/testsuite/tests/regression/pr8769/nocrypto.mli
@@ -0,0 +1,3 @@
+module Rng : sig
+  module F : sig end
+end

diff --git a/testsuite/tests/regression/pr8769/ocamltests b/testsuite/tests/regression/pr8769/ocamltests
new file mode 100644 (file)
index 0000000..195f6bc
--- /dev/null
+++ b/testsuite/tests/regression/pr8769/ocamltests
@@ -0,0 +1 @@
+pr8769.ml

diff --git a/testsuite/tests/regression/pr8769/pr8769.ml b/testsuite/tests/regression/pr8769/pr8769.ml
new file mode 100644 (file)
index 0000000..fa0c73f
--- /dev/null
+++ b/testsuite/tests/regression/pr8769/pr8769.ml
@@ -0,0 +1,32 @@
+(* TEST
+modules = "nocrypto.mli fortuna.ml rng.ml"
+
+* setup-ocamlc.byte-build-env
+** ocamlc.byte
+module = "nocrypto.mli"
+** ocamlc.byte
+flags = "-for-pack Nocrypto"
+module = "fortuna.ml"
+** ocamlc.byte
+flags = "-for-pack Nocrypto"
+module = "rng.ml"
+** ocamlc.byte
+program = "nocrypto.cmo"
+flags = "-pack"
+all_modules = "fortuna.cmo rng.cmo"
+
+* setup-ocamlopt.byte-build-env
+** ocamlopt.byte
+module = "nocrypto.mli"
+** ocamlopt.byte
+flags = "-for-pack Nocrypto"
+module = "fortuna.ml"
+** ocamlopt.byte
+flags = "-for-pack Nocrypto"
+module = "rng.ml"
+** ocamlopt.byte
+program = "nocrypto.cmx"
+flags = "-pack"
+all_modules = "fortuna.cmx rng.cmx"
+
+*)

diff --git a/testsuite/tests/regression/pr8769/rng.ml b/testsuite/tests/regression/pr8769/rng.ml
new file mode 100644 (file)
index 0000000..37a7760
--- /dev/null
+++ b/testsuite/tests/regression/pr8769/rng.ml
@@ -0,0 +1 @@
+module F = Fortuna

diff --git a/testsuite/tests/typing-implicit_unpack/implicit_unpack.ml b/testsuite/tests/typing-implicit_unpack/implicit_unpack.ml
index a6b4d697c9a25c0cc54bea38c52adec3f612094b..e503ee736f5b19a8baff40d4776b974578f33552 100644 (file)
--- a/testsuite/tests/typing-implicit_unpack/implicit_unpack.ml
+++ b/testsuite/tests/typing-implicit_unpack/implicit_unpack.ml
@@ -3,7 +3,7 @@
 *)
 
 (*
-   Implicit unpack allows to omit the signature in (val ...) expressions.
+   Implicit unpack allows the signature in (val ...) expressions to be omitted.
 
    It also adds (module M : S) and (module M) patterns, relying on
    implicit (val ...) for the implementation. Such patterns can only

diff --git a/tools/ci/appveyor/appveyor_build.cmd b/tools/ci/appveyor/appveyor_build.cmd
index 9f0ebc978453022bc294e7459774e6496be83ffb..bed57e6f82ebe01492671c0a3ffc7e6f9342c93a 100644 (file)
--- a/tools/ci/appveyor/appveyor_build.cmd
+++ b/tools/ci/appveyor/appveyor_build.cmd
@@ -1,112 +1,112 @@
-@rem ***********************************************************************
-@rem *                                                                     *
-@rem *                                 OCaml                               *
-@rem *                                                                     *
-@rem *                 David Allsopp, OCaml Labs, Cambridge.               *
-@rem *                                                                     *
-@rem *   Copyright 2017 MetaStack Solutions Ltd.                           *
-@rem *                                                                     *
-@rem *   All rights reserved.  This file is distributed under the terms of *
-@rem *   the GNU Lesser General Public License version 2.1, with the       *
-@rem *   special exception on linking described in the file LICENSE.       *
-@rem *                                                                     *
-@rem ***********************************************************************
-
-@rem BE CAREFUL ALTERING THIS FILE TO ENSURE THAT ERRORS PROPAGATE
-@rem IF A COMMAND SHOULD FAIL IT PROBABLY NEEDS TO END WITH
-@rem   || exit /b 1
-@rem BASICALLY, DO THE TESTING IN BASH...
-
-@rem Do not call setlocal!
-@echo off
-
-goto %1
-
-goto :EOF
-
-:CheckPackage
-"%CYG_ROOT%\bin\bash.exe" -lc "cygcheck -dc %1" | findstr %1 > nul
-if %ERRORLEVEL% equ 1 (
-  echo Cygwin package %1 will be installed
-  set CYGWIN_INSTALL_PACKAGES=%CYGWIN_INSTALL_PACKAGES%,%1
-)
-goto :EOF
-
-:UpgradeCygwin
-if "%CYGWIN_INSTALL_PACKAGES%" neq "" "%CYG_ROOT%\setup-x86_64.exe" --quiet-mode --no-shortcuts --no-startmenu --no-desktop --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages %CYGWIN_INSTALL_PACKAGES:~1% > nul
-for %%P in (%CYGWIN_COMMANDS%) do "%CYG_ROOT%\bin\%%P.exe" --version > nul || set CYGWIN_UPGRADE_REQUIRED=1
-"%CYG_ROOT%\bin\bash.exe" -lc "cygcheck -dc %CYGWIN_PACKAGES%"
-if %CYGWIN_UPGRADE_REQUIRED% equ 1 (
-  echo Cygwin package upgrade required - please go and drink coffee
-  "%CYG_ROOT%\setup-x86_64.exe" --quiet-mode --no-shortcuts --no-startmenu --no-desktop --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --upgrade-also > nul
-  "%CYG_ROOT%\bin\bash.exe" -lc "cygcheck -dc %CYGWIN_PACKAGES%"
-)
-goto :EOF
-
-:install
-chcp 65001 > nul
-rem This must be kept in sync with appveyor_build.sh
-set BUILD_PREFIX=🐫реализация
-git worktree add "..\%BUILD_PREFIX%-%PORT%" -b appveyor-build-%PORT%
-if "%PORT%" equ "msvc64" (
-  git worktree add "..\%BUILD_PREFIX%-msvc32" -b appveyor-build-%PORT%32
-)
-
-cd "..\%BUILD_PREFIX%-%PORT%"
-if "%PORT%" equ "mingw32" (
-  git submodule update --init flexdll
-)
-
-cd "%APPVEYOR_BUILD_FOLDER%"
-appveyor DownloadFile "https://github.com/alainfrisch/flexdll/archive/0.37.tar.gz" -FileName "flexdll.tar.gz" || exit /b 1
-appveyor DownloadFile "https://github.com/alainfrisch/flexdll/releases/download/0.37/flexdll-bin-0.37.zip" -FileName "flexdll.zip" || exit /b 1
-rem flexdll.zip is processed here, rather than in appveyor_build.sh because the
-rem unzip command comes from MSYS2 (via Git for Windows) and it has to be
-rem invoked via cmd /c in a bash script which is weird(er).
-mkdir "%APPVEYOR_BUILD_FOLDER%\..\flexdll"
-move flexdll.zip "%APPVEYOR_BUILD_FOLDER%\..\flexdll"
-cd "%APPVEYOR_BUILD_FOLDER%\..\flexdll" && unzip -q flexdll.zip
-
-rem CYGWIN_PACKAGES is the list of required Cygwin packages (cygwin is included
-rem in the list just so that the Cygwin version is always displayed on the log).
-rem CYGWIN_COMMANDS is a corresponding command to run with --version to test
-rem whether the package works. This is used to verify whether the installation
-rem needs upgrading.
-set CYGWIN_PACKAGES=cygwin make diffutils
-set CYGWIN_COMMANDS=cygcheck make diff
-if "%PORT%" equ "mingw32" (
-  set CYGWIN_PACKAGES=%CYGWIN_PACKAGES% mingw64-i686-gcc-core
-  set CYGWIN_COMMANDS=%CYGWIN_COMMANDS% i686-w64-mingw32-gcc
-)
-
-set CYGWIN_INSTALL_PACKAGES=
-set CYGWIN_UPGRADE_REQUIRED=0
-
-for %%P in (%CYGWIN_PACKAGES%) do call :CheckPackage %%P
-call :UpgradeCygwin
-
-"%CYG_ROOT%\bin\bash.exe" -lec "$APPVEYOR_BUILD_FOLDER/tools/ci/appveyor/appveyor_build.sh install" || exit /b 1
-
-goto :EOF
-
-:build
-if "%PORT%" equ "msvc64" (
-  setlocal
-  call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"
-)
-rem Do the main build (either msvc64 or mingw32)
-"%CYG_ROOT%\bin\bash.exe" -lec "$APPVEYOR_BUILD_FOLDER/tools/ci/appveyor/appveyor_build.sh" || exit /b 1
-
-if "%PORT%" neq "msvc64" goto :EOF
-
-rem Reconfigure the environment and run the msvc32 partial build
-endlocal
-call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86
-"%CYG_ROOT%\bin\bash.exe" -lec "$APPVEYOR_BUILD_FOLDER/tools/ci/appveyor/appveyor_build.sh msvc32-only" || exit /b 1
-goto :EOF
-
-:test
-rem Reconfigure the environment for the msvc64 build
-call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"
-"%CYG_ROOT%\bin\bash.exe" -lec "$APPVEYOR_BUILD_FOLDER/tools/ci/appveyor/appveyor_build.sh test" || exit /b 1
-goto :EOF
+@rem ***********************************************************************\r
+@rem *                                                                     *\r
+@rem *                                 OCaml                               *\r
+@rem *                                                                     *\r
+@rem *                 David Allsopp, OCaml Labs, Cambridge.               *\r
+@rem *                                                                     *\r
+@rem *   Copyright 2017 MetaStack Solutions Ltd.                           *\r
+@rem *                                                                     *\r
+@rem *   All rights reserved.  This file is distributed under the terms of *\r
+@rem *   the GNU Lesser General Public License version 2.1, with the       *\r
+@rem *   special exception on linking described in the file LICENSE.       *\r
+@rem *                                                                     *\r
+@rem ***********************************************************************\r
+\r
+@rem BE CAREFUL ALTERING THIS FILE TO ENSURE THAT ERRORS PROPAGATE\r
+@rem IF A COMMAND SHOULD FAIL IT PROBABLY NEEDS TO END WITH\r
+@rem   || exit /b 1\r
+@rem BASICALLY, DO THE TESTING IN BASH...\r
+\r
+@rem Do not call setlocal!\r
+@echo off\r
+\r
+goto %1\r
+\r
+goto :EOF\r
+\r
+:CheckPackage\r
+"%CYG_ROOT%\bin\bash.exe" -lc "cygcheck -dc %1" | findstr %1 > nul\r
+if %ERRORLEVEL% equ 1 (\r
+  echo Cygwin package %1 will be installed\r
+  set CYGWIN_INSTALL_PACKAGES=%CYGWIN_INSTALL_PACKAGES%,%1\r
+)\r
+goto :EOF\r
+\r
+:UpgradeCygwin\r
+if "%CYGWIN_INSTALL_PACKAGES%" neq "" "%CYG_ROOT%\setup-x86_64.exe" --quiet-mode --no-shortcuts --no-startmenu --no-desktop --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages %CYGWIN_INSTALL_PACKAGES:~1% > nul\r
+for %%P in (%CYGWIN_COMMANDS%) do "%CYG_ROOT%\bin\%%P.exe" --version > nul || set CYGWIN_UPGRADE_REQUIRED=1\r
+"%CYG_ROOT%\bin\bash.exe" -lc "cygcheck -dc %CYGWIN_PACKAGES%"\r
+if %CYGWIN_UPGRADE_REQUIRED% equ 1 (\r
+  echo Cygwin package upgrade required - please go and drink coffee\r
+  "%CYG_ROOT%\setup-x86_64.exe" --quiet-mode --no-shortcuts --no-startmenu --no-desktop --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --upgrade-also > nul\r
+  "%CYG_ROOT%\bin\bash.exe" -lc "cygcheck -dc %CYGWIN_PACKAGES%"\r
+)\r
+goto :EOF\r
+\r
+:install\r
+chcp 65001 > nul\r
+rem This must be kept in sync with appveyor_build.sh\r
+set BUILD_PREFIX=🐫реализация\r
+git worktree add "..\%BUILD_PREFIX%-%PORT%" -b appveyor-build-%PORT%\r
+if "%PORT%" equ "msvc64" (\r
+  git worktree add "..\%BUILD_PREFIX%-msvc32" -b appveyor-build-%PORT%32\r
+)\r
+\r
+cd "..\%BUILD_PREFIX%-%PORT%"\r
+if "%PORT%" equ "mingw32" (\r
+  git submodule update --init flexdll\r
+)\r
+\r
+cd "%APPVEYOR_BUILD_FOLDER%"\r
+appveyor DownloadFile "https://github.com/alainfrisch/flexdll/archive/0.37.tar.gz" -FileName "flexdll.tar.gz" || exit /b 1\r
+appveyor DownloadFile "https://github.com/alainfrisch/flexdll/releases/download/0.37/flexdll-bin-0.37.zip" -FileName "flexdll.zip" || exit /b 1\r
+rem flexdll.zip is processed here, rather than in appveyor_build.sh because the\r
+rem unzip command comes from MSYS2 (via Git for Windows) and it has to be\r
+rem invoked via cmd /c in a bash script which is weird(er).\r
+mkdir "%APPVEYOR_BUILD_FOLDER%\..\flexdll"\r
+move flexdll.zip "%APPVEYOR_BUILD_FOLDER%\..\flexdll"\r
+cd "%APPVEYOR_BUILD_FOLDER%\..\flexdll" && unzip -q flexdll.zip\r
+\r
+rem CYGWIN_PACKAGES is the list of required Cygwin packages (cygwin is included\r
+rem in the list just so that the Cygwin version is always displayed on the log).\r
+rem CYGWIN_COMMANDS is a corresponding command to run with --version to test\r
+rem whether the package works. This is used to verify whether the installation\r
+rem needs upgrading.\r
+set CYGWIN_PACKAGES=cygwin make diffutils\r
+set CYGWIN_COMMANDS=cygcheck make diff\r
+if "%PORT%" equ "mingw32" (\r
+  set CYGWIN_PACKAGES=%CYGWIN_PACKAGES% mingw64-i686-gcc-core\r
+  set CYGWIN_COMMANDS=%CYGWIN_COMMANDS% i686-w64-mingw32-gcc\r
+)\r
+\r
+set CYGWIN_INSTALL_PACKAGES=\r
+set CYGWIN_UPGRADE_REQUIRED=0\r
+\r
+for %%P in (%CYGWIN_PACKAGES%) do call :CheckPackage %%P\r
+call :UpgradeCygwin\r
+\r
+"%CYG_ROOT%\bin\bash.exe" -lec "$APPVEYOR_BUILD_FOLDER/tools/ci/appveyor/appveyor_build.sh install" || exit /b 1\r
+\r
+goto :EOF\r
+\r
+:build\r
+if "%PORT%" equ "msvc64" (\r
+  setlocal\r
+  call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"\r
+)\r
+rem Do the main build (either msvc64 or mingw32)\r
+"%CYG_ROOT%\bin\bash.exe" -lec "$APPVEYOR_BUILD_FOLDER/tools/ci/appveyor/appveyor_build.sh" || exit /b 1\r
+\r
+if "%PORT%" neq "msvc64" goto :EOF\r
+\r
+rem Reconfigure the environment and run the msvc32 partial build\r
+endlocal\r
+call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86\r
+"%CYG_ROOT%\bin\bash.exe" -lec "$APPVEYOR_BUILD_FOLDER/tools/ci/appveyor/appveyor_build.sh msvc32-only" || exit /b 1\r
+goto :EOF\r
+\r
+:test\r
+rem Reconfigure the environment for the msvc64 build\r
+call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"\r
+"%CYG_ROOT%\bin\bash.exe" -lec "$APPVEYOR_BUILD_FOLDER/tools/ci/appveyor/appveyor_build.sh test" || exit /b 1\r
+goto :EOF\r