diff -Nru jocaml-3.12.0/asmcomp/amd64/emit.mlp jocaml-3.12.1/asmcomp/amd64/emit.mlp
--- jocaml-3.12.0/asmcomp/amd64/emit.mlp	2010-06-04 19:16:58.000000000 +0000
+++ jocaml-3.12.1/asmcomp/amd64/emit.mlp	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: emit.mlp 10507 2010-06-04 19:16:58Z maranget $ *)
+(* $Id: emit.mlp 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Emission of x86-64 (AMD 64) assembly code *)
 
@@ -338,9 +338,12 @@
     | Lop(Imove | Ispill | Ireload) ->
         let src = i.arg.(0) and dst = i.res.(0) in
         if src.loc <> dst.loc then begin
-          if src.typ = Float then
-            `	movsd	{emit_reg src}, {emit_reg dst}\n`
-          else
+          match src.typ, src.loc, dst.loc with
+            Float, Reg _, Reg _ ->
+              `	movapd	{emit_reg src}, {emit_reg dst}\n`
+          | Float, _, _ ->
+              `	movsd	{emit_reg src}, {emit_reg dst}\n`
+          | _ ->
               `	movq	{emit_reg src}, {emit_reg dst}\n`
         end
     | Lop(Iconst_int n) ->
@@ -359,7 +362,7 @@
         | _ ->
           let lbl = new_label() in
           float_constants := (lbl, s) :: !float_constants;
-          `	movlpd	{emit_label lbl}(%rip), {emit_reg i.res.(0)}\n`
+          `	movsd	{emit_label lbl}(%rip), {emit_reg i.res.(0)}\n`
         end
     | Lop(Iconst_symbol s) ->
         `	{load_symbol_addr s}, {emit_reg i.res.(0)}\n`
@@ -412,7 +415,7 @@
           | Single ->
             `	cvtss2sd {emit_addressing addr i.arg 0}, {emit_reg dest}\n`
           | Double | Double_u ->
-            `	movlpd	{emit_addressing addr i.arg 0}, {emit_reg dest}\n`
+            `	movsd	{emit_addressing addr i.arg 0}, {emit_reg dest}\n`
         end
     | Lop(Istore(chunk, addr)) ->
         begin match chunk with
@@ -428,7 +431,7 @@
             `	cvtsd2ss {emit_reg i.arg.(0)}, %xmm15\n`;
             `	movss	%xmm15, {emit_addressing addr i.arg 1}\n`
           | Double | Double_u ->
-            `	movlpd	{emit_reg i.arg.(0)}, {emit_addressing addr i.arg 1}\n`
+            `	movsd	{emit_reg i.arg.(0)}, {emit_addressing addr i.arg 1}\n`
         end
     | Lop(Ialloc n) ->
         if !fastcode_flag then begin
@@ -688,17 +691,18 @@
   emit_all true fundecl.fun_body;
   List.iter emit_call_gc !call_gc_sites;
   emit_call_bound_errors ();
+  begin match Config.system with
+    "linux" | "gnu" ->
+      `	.type	{emit_symbol fundecl.fun_name},@function\n`;
+      `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
+    | _ -> ()
+  end;
   if !float_constants <> [] then begin
     if macosx
     then `	.literal8\n`
     else `	.section	.rodata.cst8,\"a\",@progbits\n`;
     List.iter emit_float_constant !float_constants
-  end;
-  match Config.system with
-    "linux" | "gnu" ->
-      `	.type	{emit_symbol fundecl.fun_name},@function\n`;
-      `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
-  | _ -> ()
+  end
 
 (* Emission of data *)
 
diff -Nru jocaml-3.12.0/asmcomp/amd64/emit_nt.mlp jocaml-3.12.1/asmcomp/amd64/emit_nt.mlp
--- jocaml-3.12.0/asmcomp/amd64/emit_nt.mlp	2010-06-04 19:16:58.000000000 +0000
+++ jocaml-3.12.1/asmcomp/amd64/emit_nt.mlp	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: emit_nt.mlp 10507 2010-06-04 19:16:58Z maranget $ *)
+(* $Id: emit_nt.mlp 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Emission of x86-64 (AMD 64) assembly code, MASM syntax *)
 
@@ -332,10 +332,13 @@
     | Lop(Imove | Ispill | Ireload) ->
         let src = i.arg.(0) and dst = i.res.(0) in
         if src.loc <> dst.loc then begin
-          if src.typ = Float then
-            `	movsd	{emit_reg dst}, {emit_reg src}\n`
-          else
-            `	mov	{emit_reg dst}, {emit_reg src}\n`
+          match src.typ, src.loc, dst.loc with
+            Float, Reg _, Reg _ ->
+              `	movapd	{emit_reg dst}, {emit_reg src}\n`
+          | Float, _, _ ->
+              `	movsd	{emit_reg dst}, {emit_reg src}\n`
+          | _ ->
+              `	mov	{emit_reg dst}, {emit_reg src}\n`
         end
     | Lop(Iconst_int n) ->
         if n = 0n then begin
@@ -357,7 +360,7 @@
         | _ ->
           let lbl = new_label() in
           float_constants := (lbl, s) :: !float_constants;
-          `	movlpd	{emit_reg i.res.(0)}, {emit_label lbl}\n`
+          `	movsd	{emit_reg i.res.(0)}, {emit_label lbl}\n`
         end
     | Lop(Iconst_symbol s) ->
         add_used_symbol s;
@@ -418,7 +421,7 @@
           | Single ->
             `	cvtss2sd {emit_reg dest}, REAL4 PTR {emit_addressing addr i.arg 0}\n`
           | Double | Double_u ->
-            `	movlpd	{emit_reg dest}, REAL8 PTR {emit_addressing addr i.arg 0}\n`
+            `	movsd	{emit_reg dest}, REAL8 PTR {emit_addressing addr i.arg 0}\n`
         end
     | Lop(Istore(chunk, addr)) ->
         begin match chunk with
@@ -434,7 +437,7 @@
             `	cvtsd2ss xmm15, {emit_reg i.arg.(0)}\n`;
             `	movss	REAL4 PTR {emit_addressing addr i.arg 1}, xmm15\n`
           | Double | Double_u ->
-            `	movlpd	REAL8 PTR {emit_addressing addr i.arg 1}, {emit_reg i.arg.(0)}\n`
+            `	movsd	REAL8 PTR {emit_addressing addr i.arg 1}, {emit_reg i.arg.(0)}\n`
         end
     | Lop(Ialloc n) ->
         if !fastcode_flag then begin
diff -Nru jocaml-3.12.0/asmcomp/asmlink.ml jocaml-3.12.1/asmcomp/asmlink.ml
--- jocaml-3.12.0/asmcomp/asmlink.ml	2010-06-04 19:16:58.000000000 +0000
+++ jocaml-3.12.1/asmcomp/asmlink.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: asmlink.ml 10507 2010-06-04 19:16:58Z maranget $ *)
+(* $Id: asmlink.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Link a set of .cmx/.o files and produce an executable *)
 
@@ -262,7 +262,7 @@
   Clflags.ccobjs := !Clflags.ccobjs @ !lib_ccobjs;
   Clflags.ccopts := !lib_ccopts @ !Clflags.ccopts;
   let objfiles = List.rev (List.map object_file_name objfiles) @
-    !Clflags.ccobjs in
+    (List.rev !Clflags.ccobjs) in
 
   let startup =
     if !Clflags.keep_startup_file
diff -Nru jocaml-3.12.0/asmcomp/closure.ml jocaml-3.12.1/asmcomp/closure.ml
--- jocaml-3.12.0/asmcomp/closure.ml	2008-10-14 07:37:28.000000000 +0000
+++ jocaml-3.12.1/asmcomp/closure.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: closure.ml 9081 2008-10-14 07:37:28Z maranget $ *)
+(* $Id: closure.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Introduction of closures, uncurrying, recognition of direct calls *)
 
@@ -513,7 +513,7 @@
       | ((ufunct, _), uargs) ->
           (Ugeneric_apply(ufunct, uargs, Debuginfo.none), Value_unknown)
       end
-  | Lsend(kind, met, obj, args) ->
+  | Lsend(kind, met, obj, args, _) ->
       let (umet, _) = close fenv cenv met in
       let (uobj, _) = close fenv cenv obj in
       (Usend(kind, umet, uobj, close_list fenv cenv args, Debuginfo.none),
diff -Nru jocaml-3.12.0/asmcomp/cmmgen.ml jocaml-3.12.1/asmcomp/cmmgen.ml
--- jocaml-3.12.0/asmcomp/cmmgen.ml	2010-06-04 19:16:58.000000000 +0000
+++ jocaml-3.12.1/asmcomp/cmmgen.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: cmmgen.ml 10507 2010-06-04 19:16:58Z maranget $ *)
+(* $Id: cmmgen.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Translation from closed lambda to C-- *)
 
@@ -580,32 +580,34 @@
   | Pbigarray_complex64 -> Double
 
 let bigarray_get unsafe elt_kind layout b args dbg =
-  match elt_kind with
-    Pbigarray_complex32 | Pbigarray_complex64 ->
-      let kind = bigarray_word_kind elt_kind in
-      let sz = bigarray_elt_size elt_kind / 2 in
-      bind "addr" (bigarray_indexing unsafe elt_kind layout b args dbg) (fun addr ->
-        box_complex
-          (Cop(Cload kind, [addr]))
-          (Cop(Cload kind, [Cop(Cadda, [addr; Cconst_int sz])])))
-  | _ ->
-      Cop(Cload (bigarray_word_kind elt_kind),
-          [bigarray_indexing unsafe elt_kind layout b args dbg])
+  bind "ba" b (fun b ->
+    match elt_kind with
+      Pbigarray_complex32 | Pbigarray_complex64 ->
+        let kind = bigarray_word_kind elt_kind in
+        let sz = bigarray_elt_size elt_kind / 2 in
+        bind "addr" (bigarray_indexing unsafe elt_kind layout b args dbg) (fun addr ->
+          box_complex
+            (Cop(Cload kind, [addr]))
+            (Cop(Cload kind, [Cop(Cadda, [addr; Cconst_int sz])])))
+    | _ ->
+        Cop(Cload (bigarray_word_kind elt_kind),
+            [bigarray_indexing unsafe elt_kind layout b args dbg]))
 
 let bigarray_set unsafe elt_kind layout b args newval dbg =
-  match elt_kind with
-    Pbigarray_complex32 | Pbigarray_complex64 ->
-      let kind = bigarray_word_kind elt_kind in
-      let sz = bigarray_elt_size elt_kind / 2 in
-      bind "newval" newval (fun newv ->
-      bind "addr" (bigarray_indexing unsafe elt_kind layout b args dbg) (fun addr ->
-        Csequence(
-          Cop(Cstore kind, [addr; complex_re newv]),
-          Cop(Cstore kind,
-              [Cop(Cadda, [addr; Cconst_int sz]); complex_im newv]))))
-  | _ ->
-      Cop(Cstore (bigarray_word_kind elt_kind),
-          [bigarray_indexing unsafe elt_kind layout b args dbg; newval])
+  bind "ba" b (fun b ->
+    match elt_kind with
+      Pbigarray_complex32 | Pbigarray_complex64 ->
+        let kind = bigarray_word_kind elt_kind in
+        let sz = bigarray_elt_size elt_kind / 2 in
+        bind "newval" newval (fun newv ->
+        bind "addr" (bigarray_indexing unsafe elt_kind layout b args dbg) (fun addr ->
+          Csequence(
+            Cop(Cstore kind, [addr; complex_re newv]),
+            Cop(Cstore kind,
+                [Cop(Cadda, [addr; Cconst_int sz]); complex_im newv]))))
+    | _ ->
+        Cop(Cstore (bigarray_word_kind elt_kind),
+            [bigarray_indexing unsafe elt_kind layout b args dbg; newval]))
 
 (* Simplification of some primitives into C calls *)
 
diff -Nru jocaml-3.12.0/asmcomp/comballoc.ml jocaml-3.12.1/asmcomp/comballoc.ml
--- jocaml-3.12.0/asmcomp/comballoc.ml	2007-03-23 09:01:11.000000000 +0000
+++ jocaml-3.12.1/asmcomp/comballoc.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: comballoc.ml 8113 2007-03-23 09:01:11Z maranget $ *)
+(* $Id: comballoc.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Combine heap allocations occurring in the same basic block *)
 
@@ -38,7 +38,7 @@
             combine i.next (Pending_alloc(i.res.(0), sz)) in
           (instr_cons (Iop(Ialloc newsz)) i.arg i.res newnext, 0)
       | Pending_alloc(reg, ofs) ->
-          if ofs + sz < Config.max_young_wosize then begin
+          if ofs + sz < Config.max_young_wosize * Arch.size_addr then begin
             let (newnext, newsz) =
               combine i.next (Pending_alloc(reg, ofs + sz)) in
             (instr_cons (Iop(Iintop_imm(Iadd, ofs))) [| reg |] i.res newnext,
diff -Nru jocaml-3.12.0/asmcomp/i386/emit.mlp jocaml-3.12.1/asmcomp/i386/emit.mlp
--- jocaml-3.12.0/asmcomp/i386/emit.mlp	2010-06-04 19:16:58.000000000 +0000
+++ jocaml-3.12.1/asmcomp/i386/emit.mlp	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: emit.mlp 10507 2010-06-04 19:16:58Z maranget $ *)
+(* $Id: emit.mlp 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Emission of Intel 386 assembly code *)
 
@@ -905,12 +905,12 @@
   emit_all true fundecl.fun_body;
   List.iter emit_call_gc !call_gc_sites;
   emit_call_bound_errors ();
-  List.iter emit_float_constant !float_constants;
-  match Config.system with
+  begin match Config.system with
     "linux_elf" | "bsd_elf" | "gnu" ->
       `	.type	{emit_symbol fundecl.fun_name},@function\n`;
       `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
-  | _ -> ()
+  | _ -> () end;
+  List.iter emit_float_constant !float_constants
 
 
 (* Emission of data *)
diff -Nru jocaml-3.12.0/asmcomp/i386/emit_nt.mlp jocaml-3.12.1/asmcomp/i386/emit_nt.mlp
--- jocaml-3.12.0/asmcomp/i386/emit_nt.mlp	2010-06-04 19:16:58.000000000 +0000
+++ jocaml-3.12.1/asmcomp/i386/emit_nt.mlp	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: emit_nt.mlp 10507 2010-06-04 19:16:58Z maranget $ *)
+(* $Id: emit_nt.mlp 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Emission of Intel 386 assembly code, MASM syntax. *)
 
@@ -813,7 +813,7 @@
       add_def_symbol s ;
       `{emit_symbol s} LABEL DWORD\n`
   | Cdefine_label lbl ->
-      `{emit_label (100000 + lbl)} `
+      `{emit_label (100000 + lbl)}	LABEL DWORD\n`
   | Cint8 n ->
       `	BYTE	{emit_int n}\n`
   | Cint16 n ->
diff -Nru jocaml-3.12.0/asmcomp/selectgen.ml jocaml-3.12.1/asmcomp/selectgen.ml
--- jocaml-3.12.0/asmcomp/selectgen.ml	2010-06-04 19:16:58.000000000 +0000
+++ jocaml-3.12.1/asmcomp/selectgen.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: selectgen.ml 10507 2010-06-04 19:16:58Z maranget $ *)
+(* $Id: selectgen.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Selection of pseudo-instructions, assignment of pseudo-registers,
    sequentialization. *)
@@ -824,3 +824,17 @@
     fun_fast = f.Cmm.fun_fast }
 
 end
+
+(* Tail call criterion (estimated).  Assumes:
+- all arguments are of type "int" (always the case for Caml function calls)
+- one extra argument representing the closure environment (conservative).
+*)
+
+let is_tail_call nargs =
+  assert (Reg.dummy.typ = Int);
+  let args = Array.make (nargs + 1) Reg.dummy in
+  let (loc_arg, stack_ofs) = Proc.loc_arguments args in
+  stack_ofs = 0
+
+let _ =
+  Simplif.is_tail_native_heuristic := is_tail_call
diff -Nru jocaml-3.12.0/asmrun/amd64nt.asm jocaml-3.12.1/asmrun/amd64nt.asm
--- jocaml-3.12.0/asmrun/amd64nt.asm	2010-06-04 19:20:20.000000000 +0000
+++ jocaml-3.12.1/asmrun/amd64nt.asm	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 ;
 ;*********************************************************************
 
-; $Id: amd64nt.asm 10522 2010-06-04 19:20:20Z maranget $
+; $Id: amd64nt.asm 11113 2011-07-07 14:32:00Z maranget $
 
 ; Asm part of the runtime system, AMD64 processor, Intel syntax
 
@@ -67,43 +67,43 @@
         mov     caml_gc_regs, rsp
     ; Save floating-point registers
         sub     rsp, 16*8
-        movlpd  QWORD PTR [rsp + 0*8], xmm0
-        movlpd  QWORD PTR [rsp + 1*8], xmm1
-        movlpd  QWORD PTR [rsp + 2*8], xmm2
-        movlpd  QWORD PTR [rsp + 3*8], xmm3
-        movlpd  QWORD PTR [rsp + 4*8], xmm4
-        movlpd  QWORD PTR [rsp + 5*8], xmm5
-        movlpd  QWORD PTR [rsp + 6*8], xmm6
-        movlpd  QWORD PTR [rsp + 7*8], xmm7
-        movlpd  QWORD PTR [rsp + 8*8], xmm8
-        movlpd  QWORD PTR [rsp + 9*8], xmm9
-        movlpd  QWORD PTR [rsp + 10*8], xmm10
-        movlpd  QWORD PTR [rsp + 11*8], xmm11
-        movlpd  QWORD PTR [rsp + 12*8], xmm12
-        movlpd  QWORD PTR [rsp + 13*8], xmm13
-        movlpd  QWORD PTR [rsp + 14*8], xmm14
-        movlpd  QWORD PTR [rsp + 15*8], xmm15
+        movsd   QWORD PTR [rsp + 0*8], xmm0
+        movsd   QWORD PTR [rsp + 1*8], xmm1
+        movsd   QWORD PTR [rsp + 2*8], xmm2
+        movsd   QWORD PTR [rsp + 3*8], xmm3
+        movsd   QWORD PTR [rsp + 4*8], xmm4
+        movsd   QWORD PTR [rsp + 5*8], xmm5
+        movsd   QWORD PTR [rsp + 6*8], xmm6
+        movsd   QWORD PTR [rsp + 7*8], xmm7
+        movsd   QWORD PTR [rsp + 8*8], xmm8
+        movsd   QWORD PTR [rsp + 9*8], xmm9
+        movsd   QWORD PTR [rsp + 10*8], xmm10
+        movsd   QWORD PTR [rsp + 11*8], xmm11
+        movsd   QWORD PTR [rsp + 12*8], xmm12
+        movsd   QWORD PTR [rsp + 13*8], xmm13
+        movsd   QWORD PTR [rsp + 14*8], xmm14
+        movsd   QWORD PTR [rsp + 15*8], xmm15
     ; Call the garbage collector
         sub rsp, 32      ; PR#5008: bottom 32 bytes are reserved for callee
         call caml_garbage_collection
         add rsp, 32      ; PR#5008
     ; Restore all regs used by the code generator
-        movlpd  xmm0, QWORD PTR [rsp + 0*8]
-        movlpd  xmm1, QWORD PTR [rsp + 1*8]
-        movlpd  xmm2, QWORD PTR [rsp + 2*8]
-        movlpd  xmm3, QWORD PTR [rsp + 3*8]
-        movlpd  xmm4, QWORD PTR [rsp + 4*8]
-        movlpd  xmm5, QWORD PTR [rsp + 5*8]
-        movlpd  xmm6, QWORD PTR [rsp + 6*8]
-        movlpd  xmm7, QWORD PTR [rsp + 7*8]
-        movlpd  xmm8, QWORD PTR [rsp + 8*8]
-        movlpd  xmm9, QWORD PTR [rsp + 9*8]
-        movlpd  xmm10, QWORD PTR [rsp + 10*8]
-        movlpd  xmm11, QWORD PTR [rsp + 11*8]
-        movlpd  xmm12, QWORD PTR [rsp + 12*8]
-        movlpd  xmm13, QWORD PTR [rsp + 13*8]
-        movlpd  xmm14, QWORD PTR [rsp + 14*8]
-        movlpd  xmm15, QWORD PTR [rsp + 15*8]
+        movsd   xmm0, QWORD PTR [rsp + 0*8]
+        movsd   xmm1, QWORD PTR [rsp + 1*8]
+        movsd   xmm2, QWORD PTR [rsp + 2*8]
+        movsd   xmm3, QWORD PTR [rsp + 3*8]
+        movsd   xmm4, QWORD PTR [rsp + 4*8]
+        movsd   xmm5, QWORD PTR [rsp + 5*8]
+        movsd   xmm6, QWORD PTR [rsp + 6*8]
+        movsd   xmm7, QWORD PTR [rsp + 7*8]
+        movsd   xmm8, QWORD PTR [rsp + 8*8]
+        movsd   xmm9, QWORD PTR [rsp + 9*8]
+        movsd   xmm10, QWORD PTR [rsp + 10*8]
+        movsd   xmm11, QWORD PTR [rsp + 11*8]
+        movsd   xmm12, QWORD PTR [rsp + 12*8]
+        movsd   xmm13, QWORD PTR [rsp + 13*8]
+        movsd   xmm14, QWORD PTR [rsp + 14*8]
+        movsd   xmm15, QWORD PTR [rsp + 15*8]
         add     rsp, 16*8
         pop     rax
         pop     rbx
diff -Nru jocaml-3.12.0/asmrun/amd64.S jocaml-3.12.1/asmrun/amd64.S
--- jocaml-3.12.0/asmrun/amd64.S	2010-06-04 19:20:20.000000000 +0000
+++ jocaml-3.12.1/asmrun/amd64.S	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: amd64.S 10522 2010-06-04 19:20:20Z maranget $ */
+/* $Id: amd64.S 11113 2011-07-07 14:32:00Z maranget $ */
 
 /* Asm part of the runtime system, AMD64 processor */
 /* Must be preprocessed by cpp */
@@ -147,44 +147,44 @@
 	STORE_VAR(%r14, caml_exception_pointer)
     /* Save floating-point registers */
         subq    $(16*8), %rsp
-        movlpd  %xmm0, 0*8(%rsp)
-        movlpd  %xmm1, 1*8(%rsp)
-        movlpd  %xmm2, 2*8(%rsp)
-        movlpd  %xmm3, 3*8(%rsp)
-        movlpd  %xmm4, 4*8(%rsp)
-        movlpd  %xmm5, 5*8(%rsp)
-        movlpd  %xmm6, 6*8(%rsp)
-        movlpd  %xmm7, 7*8(%rsp)
-        movlpd  %xmm8, 8*8(%rsp)
-        movlpd  %xmm9, 9*8(%rsp)
-        movlpd  %xmm10, 10*8(%rsp)
-        movlpd  %xmm11, 11*8(%rsp)
-        movlpd  %xmm12, 12*8(%rsp)
-        movlpd  %xmm13, 13*8(%rsp)
-        movlpd  %xmm14, 14*8(%rsp)
-        movlpd  %xmm15, 15*8(%rsp)
+        movsd   %xmm0, 0*8(%rsp)
+        movsd   %xmm1, 1*8(%rsp)
+        movsd   %xmm2, 2*8(%rsp)
+        movsd   %xmm3, 3*8(%rsp)
+        movsd   %xmm4, 4*8(%rsp)
+        movsd   %xmm5, 5*8(%rsp)
+        movsd   %xmm6, 6*8(%rsp)
+        movsd   %xmm7, 7*8(%rsp)
+        movsd   %xmm8, 8*8(%rsp)
+        movsd   %xmm9, 9*8(%rsp)
+        movsd   %xmm10, 10*8(%rsp)
+        movsd   %xmm11, 11*8(%rsp)
+        movsd   %xmm12, 12*8(%rsp)
+        movsd   %xmm13, 13*8(%rsp)
+        movsd   %xmm14, 14*8(%rsp)
+        movsd   %xmm15, 15*8(%rsp)
     /* Call the garbage collector */
         call    GCALL(caml_garbage_collection)
     /* Restore caml_young_ptr, caml_exception_pointer */
 	LOAD_VAR(caml_young_ptr, %r15)
 	LOAD_VAR(caml_exception_pointer, %r14)
     /* Restore all regs used by the code generator */
-        movlpd  0*8(%rsp), %xmm0
-        movlpd  1*8(%rsp), %xmm1
-        movlpd  2*8(%rsp), %xmm2
-        movlpd  3*8(%rsp), %xmm3
-        movlpd  4*8(%rsp), %xmm4
-        movlpd  5*8(%rsp), %xmm5
-        movlpd  6*8(%rsp), %xmm6
-        movlpd  7*8(%rsp), %xmm7
-        movlpd  8*8(%rsp), %xmm8
-        movlpd  9*8(%rsp), %xmm9
-        movlpd  10*8(%rsp), %xmm10
-        movlpd  11*8(%rsp), %xmm11
-        movlpd  12*8(%rsp), %xmm12
-        movlpd  13*8(%rsp), %xmm13
-        movlpd  14*8(%rsp), %xmm14
-        movlpd  15*8(%rsp), %xmm15
+        movsd   0*8(%rsp), %xmm0
+        movsd   1*8(%rsp), %xmm1
+        movsd   2*8(%rsp), %xmm2
+        movsd   3*8(%rsp), %xmm3
+        movsd   4*8(%rsp), %xmm4
+        movsd   5*8(%rsp), %xmm5
+        movsd   6*8(%rsp), %xmm6
+        movsd   7*8(%rsp), %xmm7
+        movsd   8*8(%rsp), %xmm8
+        movsd   9*8(%rsp), %xmm9
+        movsd   10*8(%rsp), %xmm10
+        movsd   11*8(%rsp), %xmm11
+        movsd   12*8(%rsp), %xmm12
+        movsd   13*8(%rsp), %xmm13
+        movsd   14*8(%rsp), %xmm14
+        movsd   15*8(%rsp), %xmm15
         addq    $(16*8), %rsp
         popq    %rax
         popq    %rbx
diff -Nru jocaml-3.12.0/asmrun/.depend jocaml-3.12.1/asmrun/.depend
--- jocaml-3.12.0/asmrun/.depend	2010-09-06 13:32:53.000000000 +0000
+++ jocaml-3.12.1/asmrun/.depend	2011-07-07 14:32:00.000000000 +0000
@@ -1,742 +1,741 @@
 alloc.o: alloc.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/custom.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/stacks.h \
-  ../byterun/memory.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/custom.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/stacks.h \
+ ../byterun/memory.h
 array.o: array.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h
 backtrace.o: backtrace.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/backtrace.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/misc.h ../byterun/mlvalues.h stack.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/backtrace.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/misc.h ../byterun/mlvalues.h stack.h
 callback.o: callback.c ../byterun/callback.h ../byterun/mlvalues.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/misc.h ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/mlvalues.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/misc.h ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/mlvalues.h
 compact.o: compact.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/finalise.h ../byterun/roots.h \
-  ../byterun/misc.h ../byterun/config.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/mlvalues.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/freelist.h \
-  ../byterun/gc.h ../byterun/gc_ctrl.h ../byterun/major_gc.h \
-  ../byterun/memory.h ../byterun/mlvalues.h ../byterun/roots.h \
-  ../byterun/weak.h
+ ../byterun/../config/s.h ../byterun/finalise.h ../byterun/roots.h \
+ ../byterun/misc.h ../byterun/config.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/mlvalues.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/freelist.h \
+ ../byterun/gc.h ../byterun/gc_ctrl.h ../byterun/major_gc.h \
+ ../byterun/memory.h ../byterun/mlvalues.h ../byterun/roots.h \
+ ../byterun/weak.h
 compare.o: compare.c ../byterun/custom.h ../byterun/mlvalues.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/misc.h ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/misc.h ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h
 custom.o: custom.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/custom.h ../byterun/fail.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/mlvalues.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/custom.h ../byterun/fail.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/mlvalues.h
 debugger.o: debugger.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/debugger.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/misc.h
+ ../byterun/../config/s.h ../byterun/debugger.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/misc.h
 dynlink.o: dynlink.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/dynlink.h \
-  ../byterun/fail.h ../byterun/mlvalues.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/misc.h ../byterun/osdeps.h \
-  ../byterun/prims.h
+ ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/dynlink.h \
+ ../byterun/fail.h ../byterun/mlvalues.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/misc.h ../byterun/osdeps.h \
+ ../byterun/prims.h
 extern.o: extern.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/custom.h ../byterun/fail.h \
-  ../byterun/gc.h ../byterun/intext.h ../byterun/io.h ../byterun/io.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/misc.h \
-  ../byterun/mlvalues.h ../byterun/reverse.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/custom.h ../byterun/fail.h \
+ ../byterun/gc.h ../byterun/intext.h ../byterun/io.h ../byterun/io.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/misc.h \
+ ../byterun/mlvalues.h ../byterun/reverse.h
 fail.o: fail.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/fail.h ../byterun/io.h ../byterun/gc.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/printexc.h \
-  ../byterun/signals.h stack.h ../byterun/roots.h ../byterun/memory.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/fail.h ../byterun/io.h ../byterun/gc.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/printexc.h \
+ ../byterun/signals.h stack.h ../byterun/roots.h ../byterun/memory.h
 finalise.o: finalise.c ../byterun/callback.h ../byterun/mlvalues.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/misc.h ../byterun/fail.h ../byterun/mlvalues.h \
-  ../byterun/roots.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/signals.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/misc.h ../byterun/fail.h ../byterun/mlvalues.h \
+ ../byterun/roots.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/signals.h
 floats.o: floats.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/fail.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/misc.h \
-  ../byterun/reverse.h ../byterun/stacks.h ../byterun/memory.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/fail.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/misc.h \
+ ../byterun/reverse.h ../byterun/stacks.h ../byterun/memory.h
 freelist.o: freelist.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/freelist.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/gc.h \
-  ../byterun/gc_ctrl.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/major_gc.h ../byterun/misc.h ../byterun/mlvalues.h
+ ../byterun/../config/s.h ../byterun/freelist.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/gc.h \
+ ../byterun/gc_ctrl.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/major_gc.h ../byterun/misc.h ../byterun/mlvalues.h
 gc_ctrl.o: gc_ctrl.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/compact.h ../byterun/custom.h \
-  ../byterun/finalise.h ../byterun/roots.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/freelist.h ../byterun/gc.h \
-  ../byterun/gc_ctrl.h ../byterun/major_gc.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h stack.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/compact.h ../byterun/custom.h \
+ ../byterun/finalise.h ../byterun/roots.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/freelist.h ../byterun/gc.h \
+ ../byterun/gc_ctrl.h ../byterun/major_gc.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h stack.h
 globroots.o: globroots.c ../byterun/memory.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/gc.h \
-  ../byterun/mlvalues.h ../byterun/misc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/misc.h \
-  ../byterun/mlvalues.h ../byterun/roots.h ../byterun/memory.h \
-  ../byterun/globroots.h ../byterun/roots.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/gc.h \
+ ../byterun/mlvalues.h ../byterun/misc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/misc.h \
+ ../byterun/mlvalues.h ../byterun/roots.h ../byterun/memory.h \
+ ../byterun/globroots.h ../byterun/roots.h
 hash.o: hash.c ../byterun/mlvalues.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/misc.h \
-  ../byterun/custom.h ../byterun/mlvalues.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/misc.h \
+ ../byterun/custom.h ../byterun/mlvalues.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h
 intern.o: intern.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/custom.h ../byterun/fail.h \
-  ../byterun/gc.h ../byterun/intext.h ../byterun/io.h ../byterun/io.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/mlvalues.h \
-  ../byterun/misc.h ../byterun/reverse.h ../byterun/md5.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/custom.h ../byterun/fail.h \
+ ../byterun/gc.h ../byterun/intext.h ../byterun/io.h ../byterun/io.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/mlvalues.h \
+ ../byterun/misc.h ../byterun/reverse.h ../byterun/md5.h
 ints.o: ints.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/custom.h ../byterun/fail.h ../byterun/intext.h \
-  ../byterun/io.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h ../byterun/int64_native.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/custom.h ../byterun/fail.h ../byterun/intext.h \
+ ../byterun/io.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h ../byterun/int64_native.h
 io.o: io.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/custom.h \
-  ../byterun/fail.h ../byterun/io.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h ../byterun/signals.h \
-  ../byterun/sys.h
+ ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/custom.h \
+ ../byterun/fail.h ../byterun/io.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h ../byterun/signals.h \
+ ../byterun/sys.h
 lexing.o: lexing.c ../byterun/fail.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/mlvalues.h ../byterun/stacks.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/mlvalues.h ../byterun/stacks.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h
 main.o: main.c ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/misc.h ../byterun/sys.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/misc.h ../byterun/sys.h
 major_gc.o: major_gc.c ../byterun/compact.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/misc.h \
-  ../byterun/custom.h ../byterun/mlvalues.h ../byterun/config.h \
-  ../byterun/fail.h ../byterun/finalise.h ../byterun/roots.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/freelist.h \
-  ../byterun/gc.h ../byterun/gc_ctrl.h ../byterun/major_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h ../byterun/roots.h \
-  ../byterun/weak.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/misc.h \
+ ../byterun/custom.h ../byterun/mlvalues.h ../byterun/config.h \
+ ../byterun/fail.h ../byterun/finalise.h ../byterun/roots.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/freelist.h \
+ ../byterun/gc.h ../byterun/gc_ctrl.h ../byterun/major_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h ../byterun/roots.h \
+ ../byterun/weak.h
 md5.o: md5.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/fail.h ../byterun/md5.h ../byterun/io.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/io.h \
-  ../byterun/reverse.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/fail.h ../byterun/md5.h ../byterun/io.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/io.h \
+ ../byterun/reverse.h
 memory.o: memory.c ../byterun/fail.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/freelist.h ../byterun/gc.h \
-  ../byterun/gc_ctrl.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/minor_gc.h ../byterun/minor_gc.h ../byterun/misc.h \
-  ../byterun/mlvalues.h ../byterun/signals.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/freelist.h ../byterun/gc.h \
+ ../byterun/gc_ctrl.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/minor_gc.h ../byterun/minor_gc.h ../byterun/misc.h \
+ ../byterun/mlvalues.h ../byterun/signals.h
 meta.o: meta.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/config.h ../byterun/fail.h ../byterun/fix_code.h \
-  ../byterun/interp.h ../byterun/intext.h ../byterun/io.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/minor_gc.h \
-  ../byterun/minor_gc.h ../byterun/misc.h ../byterun/mlvalues.h \
-  ../byterun/prims.h ../byterun/stacks.h ../byterun/memory.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/config.h ../byterun/fail.h ../byterun/fix_code.h \
+ ../byterun/interp.h ../byterun/intext.h ../byterun/io.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/minor_gc.h \
+ ../byterun/minor_gc.h ../byterun/misc.h ../byterun/mlvalues.h \
+ ../byterun/prims.h ../byterun/stacks.h ../byterun/memory.h
 minor_gc.o: minor_gc.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/fail.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/finalise.h \
-  ../byterun/roots.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/gc.h ../byterun/gc_ctrl.h ../byterun/major_gc.h \
-  ../byterun/memory.h ../byterun/minor_gc.h ../byterun/misc.h \
-  ../byterun/mlvalues.h ../byterun/roots.h ../byterun/signals.h \
-  ../byterun/weak.h
+ ../byterun/../config/s.h ../byterun/fail.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/finalise.h \
+ ../byterun/roots.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/gc.h ../byterun/gc_ctrl.h ../byterun/major_gc.h \
+ ../byterun/memory.h ../byterun/minor_gc.h ../byterun/misc.h \
+ ../byterun/mlvalues.h ../byterun/roots.h ../byterun/signals.h \
+ ../byterun/weak.h
 misc.o: misc.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/mlvalues.h \
-  ../byterun/misc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h
+ ../byterun/../config/s.h ../byterun/misc.h ../byterun/config.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/mlvalues.h \
+ ../byterun/misc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h
 natdynlink.o: natdynlink.c ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/misc.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/mlvalues.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h stack.h ../byterun/callback.h ../byterun/alloc.h \
-  natdynlink.h ../byterun/osdeps.h ../byterun/fail.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/misc.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/mlvalues.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h stack.h ../byterun/callback.h ../byterun/alloc.h \
+ natdynlink.h ../byterun/osdeps.h ../byterun/fail.h
 obj.o: obj.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/fail.h ../byterun/gc.h ../byterun/interp.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/minor_gc.h \
-  ../byterun/minor_gc.h ../byterun/misc.h ../byterun/mlvalues.h \
-  ../byterun/prims.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/fail.h ../byterun/gc.h ../byterun/interp.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/minor_gc.h \
+ ../byterun/minor_gc.h ../byterun/misc.h ../byterun/mlvalues.h \
+ ../byterun/prims.h
 parsing.o: parsing.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/mlvalues.h ../byterun/config.h \
-  ../byterun/misc.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/mlvalues.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/alloc.h
+ ../byterun/../config/s.h ../byterun/mlvalues.h ../byterun/config.h \
+ ../byterun/misc.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/mlvalues.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/alloc.h
 printexc.o: printexc.c ../byterun/backtrace.h ../byterun/mlvalues.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/misc.h ../byterun/callback.h ../byterun/debugger.h \
-  ../byterun/fail.h ../byterun/misc.h ../byterun/mlvalues.h \
-  ../byterun/printexc.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/misc.h ../byterun/callback.h ../byterun/debugger.h \
+ ../byterun/fail.h ../byterun/misc.h ../byterun/mlvalues.h \
+ ../byterun/printexc.h
 roots.o: roots.c ../byterun/finalise.h ../byterun/roots.h \
-  ../byterun/misc.h ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/mlvalues.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/globroots.h ../byterun/memory.h \
-  ../byterun/major_gc.h ../byterun/minor_gc.h ../byterun/misc.h \
-  ../byterun/mlvalues.h stack.h ../byterun/roots.h
+ ../byterun/misc.h ../byterun/config.h ../byterun/../config/m.h \
+ ../byterun/../config/s.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/mlvalues.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/globroots.h ../byterun/memory.h \
+ ../byterun/major_gc.h ../byterun/minor_gc.h ../byterun/misc.h \
+ ../byterun/mlvalues.h stack.h ../byterun/roots.h
 signals.o: signals.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/callback.h ../byterun/config.h \
-  ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h ../byterun/roots.h \
-  ../byterun/memory.h ../byterun/signals.h ../byterun/signals_machdep.h \
-  ../byterun/sys.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/callback.h ../byterun/config.h \
+ ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h ../byterun/roots.h \
+ ../byterun/memory.h ../byterun/signals.h ../byterun/signals_machdep.h \
+ ../byterun/sys.h
 signals_asm.o: signals_asm.c ../byterun/fail.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/osdeps.h ../byterun/signals.h ../byterun/signals_machdep.h \
-  signals_osdep.h stack.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/osdeps.h ../byterun/signals.h ../byterun/signals_machdep.h \
+ signals_osdep.h stack.h
 startup.o: startup.c ../byterun/callback.h ../byterun/mlvalues.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/misc.h ../byterun/backtrace.h ../byterun/custom.h \
-  ../byterun/fail.h ../byterun/freelist.h ../byterun/gc.h \
-  ../byterun/gc_ctrl.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h ../byterun/osdeps.h \
-  ../byterun/printexc.h stack.h ../byterun/sys.h natdynlink.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/misc.h ../byterun/backtrace.h ../byterun/custom.h \
+ ../byterun/fail.h ../byterun/freelist.h ../byterun/gc.h \
+ ../byterun/gc_ctrl.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h ../byterun/osdeps.h \
+ ../byterun/printexc.h stack.h ../byterun/sys.h natdynlink.h
 str.o: str.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/fail.h ../byterun/mlvalues.h ../byterun/misc.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/fail.h ../byterun/mlvalues.h ../byterun/misc.h
 sys.o: sys.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/debugger.h \
-  ../byterun/fail.h ../byterun/instruct.h ../byterun/mlvalues.h \
-  ../byterun/osdeps.h ../byterun/signals.h ../byterun/stacks.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/sys.h
+ ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/debugger.h \
+ ../byterun/fail.h ../byterun/instruct.h ../byterun/mlvalues.h \
+ ../byterun/osdeps.h ../byterun/signals.h ../byterun/stacks.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/sys.h
 terminfo.o: terminfo.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/fail.h \
-  ../byterun/io.h ../byterun/mlvalues.h
+ ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/fail.h \
+ ../byterun/io.h ../byterun/mlvalues.h
 unix.o: unix.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/memory.h ../byterun/config.h \
-  ../byterun/gc.h ../byterun/mlvalues.h ../byterun/misc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/osdeps.h
+ ../byterun/../config/s.h ../byterun/memory.h ../byterun/config.h \
+ ../byterun/gc.h ../byterun/mlvalues.h ../byterun/misc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/osdeps.h
 weak.o: weak.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/fail.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/minor_gc.h ../byterun/mlvalues.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/fail.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/minor_gc.h ../byterun/mlvalues.h
 alloc.d.o: alloc.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/custom.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/stacks.h \
-  ../byterun/memory.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/custom.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/stacks.h \
+ ../byterun/memory.h
 array.d.o: array.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h
 backtrace.d.o: backtrace.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/backtrace.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/misc.h ../byterun/mlvalues.h stack.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/backtrace.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/misc.h ../byterun/mlvalues.h stack.h
 callback.d.o: callback.c ../byterun/callback.h ../byterun/mlvalues.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/misc.h ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/mlvalues.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/misc.h ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/mlvalues.h
 compact.d.o: compact.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/finalise.h ../byterun/roots.h \
-  ../byterun/misc.h ../byterun/config.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/mlvalues.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/freelist.h \
-  ../byterun/gc.h ../byterun/gc_ctrl.h ../byterun/major_gc.h \
-  ../byterun/memory.h ../byterun/mlvalues.h ../byterun/roots.h \
-  ../byterun/weak.h
+ ../byterun/../config/s.h ../byterun/finalise.h ../byterun/roots.h \
+ ../byterun/misc.h ../byterun/config.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/mlvalues.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/freelist.h \
+ ../byterun/gc.h ../byterun/gc_ctrl.h ../byterun/major_gc.h \
+ ../byterun/memory.h ../byterun/mlvalues.h ../byterun/roots.h \
+ ../byterun/weak.h
 compare.d.o: compare.c ../byterun/custom.h ../byterun/mlvalues.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/misc.h ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/misc.h ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h
 custom.d.o: custom.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/custom.h ../byterun/fail.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/mlvalues.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/custom.h ../byterun/fail.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/mlvalues.h
 debugger.d.o: debugger.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/debugger.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/misc.h
+ ../byterun/../config/s.h ../byterun/debugger.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/misc.h
 dynlink.d.o: dynlink.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/dynlink.h \
-  ../byterun/fail.h ../byterun/mlvalues.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/misc.h ../byterun/osdeps.h \
-  ../byterun/prims.h
+ ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/dynlink.h \
+ ../byterun/fail.h ../byterun/mlvalues.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/misc.h ../byterun/osdeps.h \
+ ../byterun/prims.h
 extern.d.o: extern.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/custom.h ../byterun/fail.h \
-  ../byterun/gc.h ../byterun/intext.h ../byterun/io.h ../byterun/io.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/misc.h \
-  ../byterun/mlvalues.h ../byterun/reverse.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/custom.h ../byterun/fail.h \
+ ../byterun/gc.h ../byterun/intext.h ../byterun/io.h ../byterun/io.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/misc.h \
+ ../byterun/mlvalues.h ../byterun/reverse.h
 fail.d.o: fail.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/fail.h ../byterun/io.h ../byterun/gc.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/printexc.h \
-  ../byterun/signals.h stack.h ../byterun/roots.h ../byterun/memory.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/fail.h ../byterun/io.h ../byterun/gc.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/printexc.h \
+ ../byterun/signals.h stack.h ../byterun/roots.h ../byterun/memory.h
 finalise.d.o: finalise.c ../byterun/callback.h ../byterun/mlvalues.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/misc.h ../byterun/fail.h ../byterun/mlvalues.h \
-  ../byterun/roots.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/signals.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/misc.h ../byterun/fail.h ../byterun/mlvalues.h \
+ ../byterun/roots.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/signals.h
 floats.d.o: floats.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/fail.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/misc.h \
-  ../byterun/reverse.h ../byterun/stacks.h ../byterun/memory.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/fail.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/misc.h \
+ ../byterun/reverse.h ../byterun/stacks.h ../byterun/memory.h
 freelist.d.o: freelist.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/freelist.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/gc.h \
-  ../byterun/gc_ctrl.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/major_gc.h ../byterun/misc.h ../byterun/mlvalues.h
+ ../byterun/../config/s.h ../byterun/freelist.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/gc.h \
+ ../byterun/gc_ctrl.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/major_gc.h ../byterun/misc.h ../byterun/mlvalues.h
 gc_ctrl.d.o: gc_ctrl.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/compact.h ../byterun/custom.h \
-  ../byterun/finalise.h ../byterun/roots.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/freelist.h ../byterun/gc.h \
-  ../byterun/gc_ctrl.h ../byterun/major_gc.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h stack.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/compact.h ../byterun/custom.h \
+ ../byterun/finalise.h ../byterun/roots.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/freelist.h ../byterun/gc.h \
+ ../byterun/gc_ctrl.h ../byterun/major_gc.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h stack.h
 globroots.d.o: globroots.c ../byterun/memory.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/gc.h \
-  ../byterun/mlvalues.h ../byterun/misc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/misc.h \
-  ../byterun/mlvalues.h ../byterun/roots.h ../byterun/memory.h \
-  ../byterun/globroots.h ../byterun/roots.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/gc.h \
+ ../byterun/mlvalues.h ../byterun/misc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/misc.h \
+ ../byterun/mlvalues.h ../byterun/roots.h ../byterun/memory.h \
+ ../byterun/globroots.h ../byterun/roots.h
 hash.d.o: hash.c ../byterun/mlvalues.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/misc.h \
-  ../byterun/custom.h ../byterun/mlvalues.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/misc.h \
+ ../byterun/custom.h ../byterun/mlvalues.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h
 intern.d.o: intern.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/custom.h ../byterun/fail.h \
-  ../byterun/gc.h ../byterun/intext.h ../byterun/io.h ../byterun/io.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/mlvalues.h \
-  ../byterun/misc.h ../byterun/reverse.h ../byterun/md5.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/custom.h ../byterun/fail.h \
+ ../byterun/gc.h ../byterun/intext.h ../byterun/io.h ../byterun/io.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/mlvalues.h \
+ ../byterun/misc.h ../byterun/reverse.h ../byterun/md5.h
 ints.d.o: ints.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/custom.h ../byterun/fail.h ../byterun/intext.h \
-  ../byterun/io.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h ../byterun/int64_native.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/custom.h ../byterun/fail.h ../byterun/intext.h \
+ ../byterun/io.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h ../byterun/int64_native.h
 io.d.o: io.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/custom.h \
-  ../byterun/fail.h ../byterun/io.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h ../byterun/signals.h \
-  ../byterun/sys.h
+ ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/custom.h \
+ ../byterun/fail.h ../byterun/io.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h ../byterun/signals.h \
+ ../byterun/sys.h
 lexing.d.o: lexing.c ../byterun/fail.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/mlvalues.h ../byterun/stacks.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/mlvalues.h ../byterun/stacks.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h
 main.d.o: main.c ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/misc.h ../byterun/sys.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/misc.h ../byterun/sys.h
 major_gc.d.o: major_gc.c ../byterun/compact.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/misc.h \
-  ../byterun/custom.h ../byterun/mlvalues.h ../byterun/config.h \
-  ../byterun/fail.h ../byterun/finalise.h ../byterun/roots.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/freelist.h \
-  ../byterun/gc.h ../byterun/gc_ctrl.h ../byterun/major_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h ../byterun/roots.h \
-  ../byterun/weak.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/misc.h \
+ ../byterun/custom.h ../byterun/mlvalues.h ../byterun/config.h \
+ ../byterun/fail.h ../byterun/finalise.h ../byterun/roots.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/freelist.h \
+ ../byterun/gc.h ../byterun/gc_ctrl.h ../byterun/major_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h ../byterun/roots.h \
+ ../byterun/weak.h
 md5.d.o: md5.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/fail.h ../byterun/md5.h ../byterun/io.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/io.h \
-  ../byterun/reverse.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/fail.h ../byterun/md5.h ../byterun/io.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/io.h \
+ ../byterun/reverse.h
 memory.d.o: memory.c ../byterun/fail.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/freelist.h ../byterun/gc.h \
-  ../byterun/gc_ctrl.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/minor_gc.h ../byterun/minor_gc.h ../byterun/misc.h \
-  ../byterun/mlvalues.h ../byterun/signals.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/freelist.h ../byterun/gc.h \
+ ../byterun/gc_ctrl.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/minor_gc.h ../byterun/minor_gc.h ../byterun/misc.h \
+ ../byterun/mlvalues.h ../byterun/signals.h
 meta.d.o: meta.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/config.h ../byterun/fail.h ../byterun/fix_code.h \
-  ../byterun/interp.h ../byterun/intext.h ../byterun/io.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/minor_gc.h \
-  ../byterun/minor_gc.h ../byterun/misc.h ../byterun/mlvalues.h \
-  ../byterun/prims.h ../byterun/stacks.h ../byterun/memory.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/config.h ../byterun/fail.h ../byterun/fix_code.h \
+ ../byterun/interp.h ../byterun/intext.h ../byterun/io.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/minor_gc.h \
+ ../byterun/minor_gc.h ../byterun/misc.h ../byterun/mlvalues.h \
+ ../byterun/prims.h ../byterun/stacks.h ../byterun/memory.h
 minor_gc.d.o: minor_gc.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/fail.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/finalise.h \
-  ../byterun/roots.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/gc.h ../byterun/gc_ctrl.h ../byterun/major_gc.h \
-  ../byterun/memory.h ../byterun/minor_gc.h ../byterun/misc.h \
-  ../byterun/mlvalues.h ../byterun/roots.h ../byterun/signals.h \
-  ../byterun/weak.h
+ ../byterun/../config/s.h ../byterun/fail.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/finalise.h \
+ ../byterun/roots.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/gc.h ../byterun/gc_ctrl.h ../byterun/major_gc.h \
+ ../byterun/memory.h ../byterun/minor_gc.h ../byterun/misc.h \
+ ../byterun/mlvalues.h ../byterun/roots.h ../byterun/signals.h \
+ ../byterun/weak.h
 misc.d.o: misc.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/mlvalues.h \
-  ../byterun/misc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h
+ ../byterun/../config/s.h ../byterun/misc.h ../byterun/config.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/mlvalues.h \
+ ../byterun/misc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h
 natdynlink.d.o: natdynlink.c ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/misc.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/mlvalues.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h stack.h ../byterun/callback.h ../byterun/alloc.h \
-  natdynlink.h ../byterun/osdeps.h ../byterun/fail.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/misc.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/mlvalues.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h stack.h ../byterun/callback.h ../byterun/alloc.h \
+ natdynlink.h ../byterun/osdeps.h ../byterun/fail.h
 obj.d.o: obj.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/fail.h ../byterun/gc.h ../byterun/interp.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/minor_gc.h \
-  ../byterun/minor_gc.h ../byterun/misc.h ../byterun/mlvalues.h \
-  ../byterun/prims.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/fail.h ../byterun/gc.h ../byterun/interp.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/minor_gc.h \
+ ../byterun/minor_gc.h ../byterun/misc.h ../byterun/mlvalues.h \
+ ../byterun/prims.h
 parsing.d.o: parsing.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/mlvalues.h ../byterun/config.h \
-  ../byterun/misc.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/mlvalues.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/alloc.h
+ ../byterun/../config/s.h ../byterun/mlvalues.h ../byterun/config.h \
+ ../byterun/misc.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/mlvalues.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/alloc.h
 printexc.d.o: printexc.c ../byterun/backtrace.h ../byterun/mlvalues.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/misc.h ../byterun/callback.h ../byterun/debugger.h \
-  ../byterun/fail.h ../byterun/misc.h ../byterun/mlvalues.h \
-  ../byterun/printexc.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/misc.h ../byterun/callback.h ../byterun/debugger.h \
+ ../byterun/fail.h ../byterun/misc.h ../byterun/mlvalues.h \
+ ../byterun/printexc.h
 roots.d.o: roots.c ../byterun/finalise.h ../byterun/roots.h \
-  ../byterun/misc.h ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/mlvalues.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/globroots.h ../byterun/memory.h \
-  ../byterun/major_gc.h ../byterun/minor_gc.h ../byterun/misc.h \
-  ../byterun/mlvalues.h stack.h ../byterun/roots.h
+ ../byterun/misc.h ../byterun/config.h ../byterun/../config/m.h \
+ ../byterun/../config/s.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/mlvalues.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/globroots.h ../byterun/memory.h \
+ ../byterun/major_gc.h ../byterun/minor_gc.h ../byterun/misc.h \
+ ../byterun/mlvalues.h stack.h ../byterun/roots.h
 signals.d.o: signals.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/callback.h ../byterun/config.h \
-  ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h ../byterun/roots.h \
-  ../byterun/memory.h ../byterun/signals.h ../byterun/signals_machdep.h \
-  ../byterun/sys.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/callback.h ../byterun/config.h \
+ ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h ../byterun/roots.h \
+ ../byterun/memory.h ../byterun/signals.h ../byterun/signals_machdep.h \
+ ../byterun/sys.h
 signals_asm.d.o: signals_asm.c ../byterun/fail.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/osdeps.h ../byterun/signals.h ../byterun/signals_machdep.h \
-  signals_osdep.h stack.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/osdeps.h ../byterun/signals.h ../byterun/signals_machdep.h \
+ signals_osdep.h stack.h
 startup.d.o: startup.c ../byterun/callback.h ../byterun/mlvalues.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/misc.h ../byterun/backtrace.h ../byterun/custom.h \
-  ../byterun/fail.h ../byterun/freelist.h ../byterun/gc.h \
-  ../byterun/gc_ctrl.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h ../byterun/osdeps.h \
-  ../byterun/printexc.h stack.h ../byterun/sys.h natdynlink.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/misc.h ../byterun/backtrace.h ../byterun/custom.h \
+ ../byterun/fail.h ../byterun/freelist.h ../byterun/gc.h \
+ ../byterun/gc_ctrl.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h ../byterun/osdeps.h \
+ ../byterun/printexc.h stack.h ../byterun/sys.h natdynlink.h
 str.d.o: str.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/fail.h ../byterun/mlvalues.h ../byterun/misc.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/fail.h ../byterun/mlvalues.h ../byterun/misc.h
 sys.d.o: sys.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/debugger.h \
-  ../byterun/fail.h ../byterun/instruct.h ../byterun/mlvalues.h \
-  ../byterun/osdeps.h ../byterun/signals.h ../byterun/stacks.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/sys.h
+ ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/debugger.h \
+ ../byterun/fail.h ../byterun/instruct.h ../byterun/mlvalues.h \
+ ../byterun/osdeps.h ../byterun/signals.h ../byterun/stacks.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/sys.h
 terminfo.d.o: terminfo.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/fail.h \
-  ../byterun/io.h ../byterun/mlvalues.h
+ ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/fail.h \
+ ../byterun/io.h ../byterun/mlvalues.h
 unix.d.o: unix.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/memory.h ../byterun/config.h \
-  ../byterun/gc.h ../byterun/mlvalues.h ../byterun/misc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/osdeps.h
+ ../byterun/../config/s.h ../byterun/memory.h ../byterun/config.h \
+ ../byterun/gc.h ../byterun/mlvalues.h ../byterun/misc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/osdeps.h
 weak.d.o: weak.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/fail.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/minor_gc.h ../byterun/mlvalues.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/fail.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/minor_gc.h ../byterun/mlvalues.h
 alloc.p.o: alloc.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/custom.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/stacks.h \
-  ../byterun/memory.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/custom.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/stacks.h \
+ ../byterun/memory.h
 array.p.o: array.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h
 backtrace.p.o: backtrace.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/backtrace.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/misc.h ../byterun/mlvalues.h stack.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/backtrace.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/misc.h ../byterun/mlvalues.h stack.h
 callback.p.o: callback.c ../byterun/callback.h ../byterun/mlvalues.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/misc.h ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/mlvalues.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/misc.h ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/mlvalues.h
 compact.p.o: compact.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/finalise.h ../byterun/roots.h \
-  ../byterun/misc.h ../byterun/config.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/mlvalues.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/freelist.h \
-  ../byterun/gc.h ../byterun/gc_ctrl.h ../byterun/major_gc.h \
-  ../byterun/memory.h ../byterun/mlvalues.h ../byterun/roots.h \
-  ../byterun/weak.h
+ ../byterun/../config/s.h ../byterun/finalise.h ../byterun/roots.h \
+ ../byterun/misc.h ../byterun/config.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/mlvalues.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/freelist.h \
+ ../byterun/gc.h ../byterun/gc_ctrl.h ../byterun/major_gc.h \
+ ../byterun/memory.h ../byterun/mlvalues.h ../byterun/roots.h \
+ ../byterun/weak.h
 compare.p.o: compare.c ../byterun/custom.h ../byterun/mlvalues.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/misc.h ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/misc.h ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h
 custom.p.o: custom.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/custom.h ../byterun/fail.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/mlvalues.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/custom.h ../byterun/fail.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/mlvalues.h
 debugger.p.o: debugger.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/debugger.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/misc.h
+ ../byterun/../config/s.h ../byterun/debugger.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/misc.h
 dynlink.p.o: dynlink.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/dynlink.h \
-  ../byterun/fail.h ../byterun/mlvalues.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/misc.h ../byterun/osdeps.h \
-  ../byterun/prims.h
+ ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/dynlink.h \
+ ../byterun/fail.h ../byterun/mlvalues.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/misc.h ../byterun/osdeps.h \
+ ../byterun/prims.h
 extern.p.o: extern.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/custom.h ../byterun/fail.h \
-  ../byterun/gc.h ../byterun/intext.h ../byterun/io.h ../byterun/io.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/misc.h \
-  ../byterun/mlvalues.h ../byterun/reverse.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/custom.h ../byterun/fail.h \
+ ../byterun/gc.h ../byterun/intext.h ../byterun/io.h ../byterun/io.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/misc.h \
+ ../byterun/mlvalues.h ../byterun/reverse.h
 fail.p.o: fail.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/fail.h ../byterun/io.h ../byterun/gc.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/printexc.h \
-  ../byterun/signals.h stack.h ../byterun/roots.h ../byterun/memory.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/fail.h ../byterun/io.h ../byterun/gc.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/printexc.h \
+ ../byterun/signals.h stack.h ../byterun/roots.h ../byterun/memory.h
 finalise.p.o: finalise.c ../byterun/callback.h ../byterun/mlvalues.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/misc.h ../byterun/fail.h ../byterun/mlvalues.h \
-  ../byterun/roots.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/signals.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/misc.h ../byterun/fail.h ../byterun/mlvalues.h \
+ ../byterun/roots.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/signals.h
 floats.p.o: floats.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/fail.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/misc.h \
-  ../byterun/reverse.h ../byterun/stacks.h ../byterun/memory.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/fail.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/misc.h \
+ ../byterun/reverse.h ../byterun/stacks.h ../byterun/memory.h
 freelist.p.o: freelist.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/freelist.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/gc.h \
-  ../byterun/gc_ctrl.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/major_gc.h ../byterun/misc.h ../byterun/mlvalues.h
+ ../byterun/../config/s.h ../byterun/freelist.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/gc.h \
+ ../byterun/gc_ctrl.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/major_gc.h ../byterun/misc.h ../byterun/mlvalues.h
 gc_ctrl.p.o: gc_ctrl.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/compact.h ../byterun/custom.h \
-  ../byterun/finalise.h ../byterun/roots.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/freelist.h ../byterun/gc.h \
-  ../byterun/gc_ctrl.h ../byterun/major_gc.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h stack.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/compact.h ../byterun/custom.h \
+ ../byterun/finalise.h ../byterun/roots.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/freelist.h ../byterun/gc.h \
+ ../byterun/gc_ctrl.h ../byterun/major_gc.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h stack.h
 globroots.p.o: globroots.c ../byterun/memory.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/gc.h \
-  ../byterun/mlvalues.h ../byterun/misc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/misc.h \
-  ../byterun/mlvalues.h ../byterun/roots.h ../byterun/memory.h \
-  ../byterun/globroots.h ../byterun/roots.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/gc.h \
+ ../byterun/mlvalues.h ../byterun/misc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/misc.h \
+ ../byterun/mlvalues.h ../byterun/roots.h ../byterun/memory.h \
+ ../byterun/globroots.h ../byterun/roots.h
 hash.p.o: hash.c ../byterun/mlvalues.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/misc.h \
-  ../byterun/custom.h ../byterun/mlvalues.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/misc.h \
+ ../byterun/custom.h ../byterun/mlvalues.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h
 intern.p.o: intern.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/custom.h ../byterun/fail.h \
-  ../byterun/gc.h ../byterun/intext.h ../byterun/io.h ../byterun/io.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/mlvalues.h \
-  ../byterun/misc.h ../byterun/reverse.h ../byterun/md5.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/custom.h ../byterun/fail.h \
+ ../byterun/gc.h ../byterun/intext.h ../byterun/io.h ../byterun/io.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/mlvalues.h \
+ ../byterun/misc.h ../byterun/reverse.h ../byterun/md5.h
 ints.p.o: ints.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/custom.h ../byterun/fail.h ../byterun/intext.h \
-  ../byterun/io.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h ../byterun/int64_native.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/custom.h ../byterun/fail.h ../byterun/intext.h \
+ ../byterun/io.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h ../byterun/int64_native.h
 io.p.o: io.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/custom.h \
-  ../byterun/fail.h ../byterun/io.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h ../byterun/signals.h \
-  ../byterun/sys.h
+ ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/custom.h \
+ ../byterun/fail.h ../byterun/io.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h ../byterun/signals.h \
+ ../byterun/sys.h
 lexing.p.o: lexing.c ../byterun/fail.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/mlvalues.h ../byterun/stacks.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/mlvalues.h ../byterun/stacks.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h
 main.p.o: main.c ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/misc.h ../byterun/sys.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/misc.h ../byterun/sys.h
 major_gc.p.o: major_gc.c ../byterun/compact.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/misc.h \
-  ../byterun/custom.h ../byterun/mlvalues.h ../byterun/config.h \
-  ../byterun/fail.h ../byterun/finalise.h ../byterun/roots.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/freelist.h \
-  ../byterun/gc.h ../byterun/gc_ctrl.h ../byterun/major_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h ../byterun/roots.h \
-  ../byterun/weak.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/misc.h \
+ ../byterun/custom.h ../byterun/mlvalues.h ../byterun/config.h \
+ ../byterun/fail.h ../byterun/finalise.h ../byterun/roots.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/freelist.h \
+ ../byterun/gc.h ../byterun/gc_ctrl.h ../byterun/major_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h ../byterun/roots.h \
+ ../byterun/weak.h
 md5.p.o: md5.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/fail.h ../byterun/md5.h ../byterun/io.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/io.h \
-  ../byterun/reverse.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/fail.h ../byterun/md5.h ../byterun/io.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/mlvalues.h ../byterun/io.h \
+ ../byterun/reverse.h
 memory.p.o: memory.c ../byterun/fail.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/freelist.h ../byterun/gc.h \
-  ../byterun/gc_ctrl.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/minor_gc.h ../byterun/minor_gc.h ../byterun/misc.h \
-  ../byterun/mlvalues.h ../byterun/signals.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/freelist.h ../byterun/gc.h \
+ ../byterun/gc_ctrl.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/minor_gc.h ../byterun/minor_gc.h ../byterun/misc.h \
+ ../byterun/mlvalues.h ../byterun/signals.h
 meta.p.o: meta.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/config.h ../byterun/fail.h ../byterun/fix_code.h \
-  ../byterun/interp.h ../byterun/intext.h ../byterun/io.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/minor_gc.h \
-  ../byterun/minor_gc.h ../byterun/misc.h ../byterun/mlvalues.h \
-  ../byterun/prims.h ../byterun/stacks.h ../byterun/memory.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/config.h ../byterun/fail.h ../byterun/fix_code.h \
+ ../byterun/interp.h ../byterun/intext.h ../byterun/io.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/minor_gc.h \
+ ../byterun/minor_gc.h ../byterun/misc.h ../byterun/mlvalues.h \
+ ../byterun/prims.h ../byterun/stacks.h ../byterun/memory.h
 minor_gc.p.o: minor_gc.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/fail.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/finalise.h \
-  ../byterun/roots.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/gc.h ../byterun/gc_ctrl.h ../byterun/major_gc.h \
-  ../byterun/memory.h ../byterun/minor_gc.h ../byterun/misc.h \
-  ../byterun/mlvalues.h ../byterun/roots.h ../byterun/signals.h \
-  ../byterun/weak.h
+ ../byterun/../config/s.h ../byterun/fail.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/finalise.h \
+ ../byterun/roots.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/gc.h ../byterun/gc_ctrl.h ../byterun/major_gc.h \
+ ../byterun/memory.h ../byterun/minor_gc.h ../byterun/misc.h \
+ ../byterun/mlvalues.h ../byterun/roots.h ../byterun/signals.h \
+ ../byterun/weak.h
 misc.p.o: misc.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/mlvalues.h \
-  ../byterun/misc.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h
+ ../byterun/../config/s.h ../byterun/misc.h ../byterun/config.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/mlvalues.h \
+ ../byterun/misc.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h
 natdynlink.p.o: natdynlink.c ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/misc.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/mlvalues.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h stack.h ../byterun/callback.h ../byterun/alloc.h \
-  natdynlink.h ../byterun/osdeps.h ../byterun/fail.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/misc.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/mlvalues.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h stack.h ../byterun/callback.h ../byterun/alloc.h \
+ natdynlink.h ../byterun/osdeps.h ../byterun/fail.h
 obj.p.o: obj.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/fail.h ../byterun/gc.h ../byterun/interp.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/memory.h \
-  ../byterun/gc.h ../byterun/major_gc.h ../byterun/minor_gc.h \
-  ../byterun/minor_gc.h ../byterun/misc.h ../byterun/mlvalues.h \
-  ../byterun/prims.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/fail.h ../byterun/gc.h ../byterun/interp.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/memory.h \
+ ../byterun/gc.h ../byterun/major_gc.h ../byterun/minor_gc.h \
+ ../byterun/minor_gc.h ../byterun/misc.h ../byterun/mlvalues.h \
+ ../byterun/prims.h
 parsing.p.o: parsing.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/mlvalues.h ../byterun/config.h \
-  ../byterun/misc.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/mlvalues.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/alloc.h
+ ../byterun/../config/s.h ../byterun/mlvalues.h ../byterun/config.h \
+ ../byterun/misc.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/mlvalues.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/alloc.h
 printexc.p.o: printexc.c ../byterun/backtrace.h ../byterun/mlvalues.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/misc.h ../byterun/callback.h ../byterun/debugger.h \
-  ../byterun/fail.h ../byterun/misc.h ../byterun/mlvalues.h \
-  ../byterun/printexc.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/misc.h ../byterun/callback.h ../byterun/debugger.h \
+ ../byterun/fail.h ../byterun/misc.h ../byterun/mlvalues.h \
+ ../byterun/printexc.h
 roots.p.o: roots.c ../byterun/finalise.h ../byterun/roots.h \
-  ../byterun/misc.h ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/mlvalues.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/minor_gc.h ../byterun/globroots.h ../byterun/memory.h \
-  ../byterun/major_gc.h ../byterun/minor_gc.h ../byterun/misc.h \
-  ../byterun/mlvalues.h stack.h ../byterun/roots.h
+ ../byterun/misc.h ../byterun/config.h ../byterun/../config/m.h \
+ ../byterun/../config/s.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/mlvalues.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/minor_gc.h ../byterun/globroots.h ../byterun/memory.h \
+ ../byterun/major_gc.h ../byterun/minor_gc.h ../byterun/misc.h \
+ ../byterun/mlvalues.h stack.h ../byterun/roots.h
 signals.p.o: signals.c ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/callback.h ../byterun/config.h \
-  ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h ../byterun/roots.h \
-  ../byterun/memory.h ../byterun/signals.h ../byterun/signals_machdep.h \
-  ../byterun/sys.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/callback.h ../byterun/config.h \
+ ../byterun/fail.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h ../byterun/roots.h \
+ ../byterun/memory.h ../byterun/signals.h ../byterun/signals_machdep.h \
+ ../byterun/sys.h
 signals_asm.p.o: signals_asm.c ../byterun/fail.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/mlvalues.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/osdeps.h ../byterun/signals.h ../byterun/signals_machdep.h \
-  signals_osdep.h stack.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/mlvalues.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/osdeps.h ../byterun/signals.h ../byterun/signals_machdep.h \
+ signals_osdep.h stack.h
 startup.p.o: startup.c ../byterun/callback.h ../byterun/mlvalues.h \
-  ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
-  ../byterun/misc.h ../byterun/backtrace.h ../byterun/custom.h \
-  ../byterun/fail.h ../byterun/freelist.h ../byterun/gc.h \
-  ../byterun/gc_ctrl.h ../byterun/memory.h ../byterun/gc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/mlvalues.h ../byterun/osdeps.h \
-  ../byterun/printexc.h stack.h ../byterun/sys.h natdynlink.h
+ ../byterun/config.h ../byterun/../config/m.h ../byterun/../config/s.h \
+ ../byterun/misc.h ../byterun/backtrace.h ../byterun/custom.h \
+ ../byterun/fail.h ../byterun/freelist.h ../byterun/gc.h \
+ ../byterun/gc_ctrl.h ../byterun/memory.h ../byterun/gc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/mlvalues.h ../byterun/osdeps.h \
+ ../byterun/printexc.h stack.h ../byterun/sys.h natdynlink.h
 str.p.o: str.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/fail.h ../byterun/mlvalues.h ../byterun/misc.h
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/fail.h ../byterun/mlvalues.h ../byterun/misc.h
 sys.p.o: sys.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/debugger.h \
-  ../byterun/fail.h ../byterun/instruct.h ../byterun/mlvalues.h \
-  ../byterun/osdeps.h ../byterun/signals.h ../byterun/stacks.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/sys.h
+ ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/debugger.h \
+ ../byterun/fail.h ../byterun/instruct.h ../byterun/mlvalues.h \
+ ../byterun/osdeps.h ../byterun/signals.h ../byterun/stacks.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/freelist.h ../byterun/minor_gc.h ../byterun/sys.h
 terminfo.p.o: terminfo.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
-  ../byterun/config.h ../byterun/mlvalues.h ../byterun/fail.h \
-  ../byterun/io.h ../byterun/mlvalues.h
+ ../byterun/../config/s.h ../byterun/alloc.h ../byterun/misc.h \
+ ../byterun/config.h ../byterun/mlvalues.h ../byterun/fail.h \
+ ../byterun/io.h ../byterun/mlvalues.h
 unix.p.o: unix.c ../byterun/config.h ../byterun/../config/m.h \
-  ../byterun/../config/s.h ../byterun/memory.h ../byterun/config.h \
-  ../byterun/gc.h ../byterun/mlvalues.h ../byterun/misc.h \
-  ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
-  ../byterun/misc.h ../byterun/osdeps.h
+ ../byterun/../config/s.h ../byterun/memory.h ../byterun/config.h \
+ ../byterun/gc.h ../byterun/mlvalues.h ../byterun/misc.h \
+ ../byterun/major_gc.h ../byterun/freelist.h ../byterun/minor_gc.h \
+ ../byterun/misc.h ../byterun/osdeps.h
 weak.p.o: weak.c ../byterun/alloc.h ../byterun/misc.h ../byterun/config.h \
-  ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
-  ../byterun/fail.h ../byterun/major_gc.h ../byterun/freelist.h \
-  ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
-  ../byterun/minor_gc.h ../byterun/mlvalues.h
-
+ ../byterun/../config/m.h ../byterun/../config/s.h ../byterun/mlvalues.h \
+ ../byterun/fail.h ../byterun/major_gc.h ../byterun/freelist.h \
+ ../byterun/memory.h ../byterun/gc.h ../byterun/major_gc.h \
+ ../byterun/minor_gc.h ../byterun/mlvalues.h
Binary files /tmp/ysYQe4R4tq/jocaml-3.12.0/boot/ocamlc and /tmp/IqE2tGeGlR/jocaml-3.12.1/boot/ocamlc differ
Binary files /tmp/ysYQe4R4tq/jocaml-3.12.0/boot/ocamldep and /tmp/IqE2tGeGlR/jocaml-3.12.1/boot/ocamldep differ
Binary files /tmp/ysYQe4R4tq/jocaml-3.12.0/boot/ocamllex and /tmp/IqE2tGeGlR/jocaml-3.12.1/boot/ocamllex differ
diff -Nru jocaml-3.12.0/build/boot.sh jocaml-3.12.1/build/boot.sh
--- jocaml-3.12.0/build/boot.sh	2010-06-04 19:03:36.000000000 +0000
+++ jocaml-3.12.1/build/boot.sh	2011-07-07 14:32:00.000000000 +0000
@@ -1,8 +1,8 @@
 #!/bin/sh
-# $Id: boot.sh 10500 2010-06-04 19:03:36Z maranget $
+# $Id: boot.sh 11113 2011-07-07 14:32:00Z maranget $
 cd `dirname $0`/..
 set -ex
-TAGLINE='true: -use_stdlib'
+TAG_LINE='true: -use_stdlib'
 ./boot/ocamlrun boot/myocamlbuild.boot \
   -tag-line "$TAG_LINE" \
   boot/stdlib.cma boot/std_exit.cmo
diff -Nru jocaml-3.12.0/build/camlp4-bootstrap-recipe.txt jocaml-3.12.1/build/camlp4-bootstrap-recipe.txt
--- jocaml-3.12.0/build/camlp4-bootstrap-recipe.txt	2010-06-29 13:52:11.000000000 +0000
+++ jocaml-3.12.1/build/camlp4-bootstrap-recipe.txt	2011-07-07 14:32:00.000000000 +0000
@@ -95,7 +95,8 @@
  Then "Generate Camlp4Ast.ml" and build.
 
  We get a single warning in Camlp4/Struct/Camlp4Ast2OCamlAst.ml but
- don't fix it now.
+ don't fix it now. Notice that you may need to disable '-warn-error'
+ in order to be able to successfully compile, despite of the warning.
 
  Then I hacked the camlp4/boot/camlp4boot.ml to generate:
    Ast.ExOpI(_loc, i, e)
diff -Nru jocaml-3.12.0/build/camlp4-byte-only.sh jocaml-3.12.1/build/camlp4-byte-only.sh
--- jocaml-3.12.0/build/camlp4-byte-only.sh	2010-06-04 20:01:14.000000000 +0000
+++ jocaml-3.12.1/build/camlp4-byte-only.sh	2011-07-07 14:32:00.000000000 +0000
@@ -8,12 +8,11 @@
 #                                                                       #
 #   Copyright 2008 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
-#   under the terms of the GNU Library General Public License, with     #
-#   the special exception on linking described in file LICENSE.         #
+#   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
 #########################################################################
 
-# $Id: camlp4-byte-only.sh 10526 2010-06-04 20:01:14Z maranget $
+# $Id: camlp4-byte-only.sh 11113 2011-07-07 14:32:00Z maranget $
 
 set -e
 cd `dirname $0`/..
diff -Nru jocaml-3.12.0/build/camlp4-native-only.sh jocaml-3.12.1/build/camlp4-native-only.sh
--- jocaml-3.12.0/build/camlp4-native-only.sh	2010-06-04 20:01:14.000000000 +0000
+++ jocaml-3.12.1/build/camlp4-native-only.sh	2011-07-07 14:32:00.000000000 +0000
@@ -8,12 +8,11 @@
 #                                                                       #
 #   Copyright 2008 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
-#   under the terms of the GNU Library General Public License, with     #
-#   the special exception on linking described in file LICENSE.         #
+#   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
 #########################################################################
 
-# $Id: camlp4-native-only.sh 10526 2010-06-04 20:01:14Z maranget $
+# $Id: camlp4-native-only.sh 11113 2011-07-07 14:32:00Z maranget $
 
 set -e
 cd `dirname $0`/..
diff -Nru jocaml-3.12.0/build/fastworld.sh jocaml-3.12.1/build/fastworld.sh
--- jocaml-3.12.0/build/fastworld.sh	2010-06-04 20:01:14.000000000 +0000
+++ jocaml-3.12.1/build/fastworld.sh	2011-07-07 14:32:00.000000000 +0000
@@ -8,12 +8,11 @@
 #                                                                       #
 #   Copyright 2008 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
-#   under the terms of the GNU Library General Public License, with     #
-#   the special exception on linking described in file LICENSE.         #
+#   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
 #########################################################################
 
-# $Id: fastworld.sh 10526 2010-06-04 20:01:14Z maranget $
+# $Id: fastworld.sh 11113 2011-07-07 14:32:00Z maranget $
 
 cd `dirname $0`
 set -e
@@ -45,3 +44,7 @@
   $OCAMLC_NATIVE $TOPLEVEL $OTHERLIBS_BYTE $OTHERLIBS_NATIVE $OCAMLLEX_BYTE \
   $OCAMLLEX_NATIVE $TOOLS_BYTE $TOOLS_NATIVE $DEBUGGER  \
   $OCAMLDOC_BYTE $OCAMLDOC_NATIVE $OCAMLBUILD_BYTE $CAMLP4_BYTE $CAMLP4_NATIVE
+
+cd tools
+make objinfo_helper
+cd ..
diff -Nru jocaml-3.12.0/build/install.sh jocaml-3.12.1/build/install.sh
--- jocaml-3.12.0/build/install.sh	2010-06-04 20:01:14.000000000 +0000
+++ jocaml-3.12.1/build/install.sh	2011-07-07 14:32:00.000000000 +0000
@@ -12,7 +12,7 @@
 #                                                                       #
 #########################################################################
 
-# $Id: install.sh 10526 2010-06-04 20:01:14Z maranget $
+# $Id: install.sh 11113 2011-07-07 14:32:00Z maranget $
 
 set -e
 
@@ -264,6 +264,8 @@
 installbin tools/ocamldep.native$EXE $BINDIR/ocamldep.opt$EXE
 
 echo "Installing some tools..."
+installbin tools/objinfo.byte$EXE $BINDIR/ocamlobjinfo$EXE
+installbin ../tools/objinfo_helper$EXE $LIBDIR/objinfo_helper$EXE
 installbin tools/ocamlcp.byte$EXE $BINDIR/ocamlcp$EXE
 installbin tools/ocamldep.byte$EXE $BINDIR/ocamldep$EXE
 installbin tools/ocamlmklib.byte$EXE $BINDIR/ocamlmklib$EXE
diff -Nru jocaml-3.12.0/build/ocamlbuild-byte-only.sh jocaml-3.12.1/build/ocamlbuild-byte-only.sh
--- jocaml-3.12.0/build/ocamlbuild-byte-only.sh	2010-06-04 20:01:14.000000000 +0000
+++ jocaml-3.12.1/build/ocamlbuild-byte-only.sh	2011-07-07 14:32:00.000000000 +0000
@@ -8,12 +8,11 @@
 #                                                                       #
 #   Copyright 2008 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
-#   under the terms of the GNU Library General Public License, with     #
-#   the special exception on linking described in file LICENSE.         #
+#   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
 #########################################################################
 
-# $Id: ocamlbuild-byte-only.sh 10526 2010-06-04 20:01:14Z maranget $
+# $Id: ocamlbuild-byte-only.sh 11113 2011-07-07 14:32:00Z maranget $
 
 set -e
 cd `dirname $0`/..
diff -Nru jocaml-3.12.0/build/ocamlbuildlib-native-only.sh jocaml-3.12.1/build/ocamlbuildlib-native-only.sh
--- jocaml-3.12.0/build/ocamlbuildlib-native-only.sh	2010-06-04 20:01:14.000000000 +0000
+++ jocaml-3.12.1/build/ocamlbuildlib-native-only.sh	2011-07-07 14:32:00.000000000 +0000
@@ -8,12 +8,11 @@
 #                                                                       #
 #   Copyright 2008 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
-#   under the terms of the GNU Library General Public License, with     #
-#   the special exception on linking described in file LICENSE.         #
+#   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
 #########################################################################
 
-# $Id: ocamlbuildlib-native-only.sh 10526 2010-06-04 20:01:14Z maranget $
+# $Id: ocamlbuildlib-native-only.sh 11113 2011-07-07 14:32:00Z maranget $
 
 set -e
 cd `dirname $0`/..
diff -Nru jocaml-3.12.0/build/ocamlbuild-native-only.sh jocaml-3.12.1/build/ocamlbuild-native-only.sh
--- jocaml-3.12.0/build/ocamlbuild-native-only.sh	2010-06-04 20:01:14.000000000 +0000
+++ jocaml-3.12.1/build/ocamlbuild-native-only.sh	2011-07-07 14:32:00.000000000 +0000
@@ -8,12 +8,11 @@
 #                                                                       #
 #   Copyright 2008 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
-#   under the terms of the GNU Library General Public License, with     #
-#   the special exception on linking described in file LICENSE.         #
+#   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
 #########################################################################
 
-# $Id: ocamlbuild-native-only.sh 10526 2010-06-04 20:01:14Z maranget $
+# $Id: ocamlbuild-native-only.sh 11113 2011-07-07 14:32:00Z maranget $
 
 set -e
 cd `dirname $0`/..
diff -Nru jocaml-3.12.0/build/otherlibs-targets.sh jocaml-3.12.1/build/otherlibs-targets.sh
--- jocaml-3.12.0/build/otherlibs-targets.sh	2010-06-04 20:01:14.000000000 +0000
+++ jocaml-3.12.1/build/otherlibs-targets.sh	2011-07-07 14:32:00.000000000 +0000
@@ -8,12 +8,11 @@
 #                                                                       #
 #   Copyright 2008 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
-#   under the terms of the GNU Library General Public License, with     #
-#   the special exception on linking described in file LICENSE.         #
+#   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
 #########################################################################
 
-# $Id: otherlibs-targets.sh 10526 2010-06-04 20:01:14Z maranget $
+# $Id: otherlibs-targets.sh 11113 2011-07-07 14:32:00Z maranget $
 
 OTHERLIBS_BYTE=""
 OTHERLIBS_NATIVE=""
diff -Nru jocaml-3.12.0/build/targets.sh jocaml-3.12.1/build/targets.sh
--- jocaml-3.12.0/build/targets.sh	2010-06-04 20:01:14.000000000 +0000
+++ jocaml-3.12.1/build/targets.sh	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 #                                                                       #
 #########################################################################
 
-# $Id: targets.sh 10526 2010-06-04 20:01:14Z maranget $
+# $Id: targets.sh 11113 2011-07-07 14:32:00Z maranget $
 
 . config/config.sh
 . build/otherlibs-targets.sh
@@ -30,7 +30,8 @@
                  ocamlbuild/ocamlbuild.byte$EXE \
                  ocamlbuild/ocamlbuildlight.byte$EXE"
 TOPLEVEL=ocaml$EXE
-TOOLS_BYTE="tools/ocamldep.byte$EXE tools/profiling.cmo \
+TOOLS_BYTE="tools/objinfo.byte$EXE \
+            tools/ocamldep.byte$EXE tools/profiling.cmo \
             tools/ocamlprof.byte$EXE tools/ocamlcp.byte$EXE \
             tools/ocamlmktop.byte$EXE tools/ocamlmklib$EXE \
             tools/scrapelabels.byte tools/addlabels.byte \
diff -Nru jocaml-3.12.0/build/world.sh jocaml-3.12.1/build/world.sh
--- jocaml-3.12.0/build/world.sh	2010-06-04 20:01:14.000000000 +0000
+++ jocaml-3.12.1/build/world.sh	2011-07-07 14:32:00.000000000 +0000
@@ -8,8 +8,7 @@
 #                                                                       #
 #   Copyright 2008 Institut National de Recherche en Informatique et    #
 #   en Automatique.  All rights reserved.  This file is distributed     #
-#   under the terms of the GNU Library General Public License, with     #
-#   the special exception on linking described in file LICENSE.         #
+#   under the terms of the Q Public License version 1.0.                #
 #                                                                       #
 #########################################################################
 
diff -Nru jocaml-3.12.0/bytecomp/bytegen.ml jocaml-3.12.1/bytecomp/bytegen.ml
--- jocaml-3.12.0/bytecomp/bytegen.ml	2009-08-21 08:39:33.000000000 +0000
+++ jocaml-3.12.1/bytecomp/bytegen.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: bytegen.ml 9322 2009-08-21 08:39:33Z maranget $ *)
+(* $Id: bytegen.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (*  bytegen.ml : translation of lambda terms to lists of instructions. *)
 
@@ -413,12 +413,10 @@
   | Lapply(func, args, loc) ->
       let nargs = List.length args in
       if is_tailcall cont then begin
-        Stypes.record (Stypes.An_call (loc, Annot.Tail));
         comp_args env args sz
           (Kpush :: comp_expr env func (sz + nargs)
             (Kappterm(nargs, sz + nargs) :: discard_dead_code cont))
       end else begin
-        Stypes.record (Stypes.An_call (loc, Annot.Stack));
         if nargs < 4 then
           comp_args env args sz
             (Kpush :: comp_expr env func (sz + nargs) (Kapply nargs :: cont))
@@ -430,7 +428,7 @@
                       (Kapply nargs :: cont1))
         end
       end
-  | Lsend(kind, met, obj, args) ->
+  | Lsend(kind, met, obj, args, _) ->
       let args = if kind = Cached then List.tl args else args in
       let nargs = List.length args + 1 in
       let getmethod, args' =
@@ -746,9 +744,9 @@
       | Lev_after ty ->
           let info =
             match lam with
-              Lapply(_, args, _)   -> Event_return (List.length args)
-            | Lsend(_, _, _, args) -> Event_return (List.length args + 1)
-            | _                 -> Event_other
+              Lapply(_, args, _)      -> Event_return (List.length args)
+            | Lsend(_, _, _, args, _) -> Event_return (List.length args + 1)
+            | _                       -> Event_other
           in
           let ev = event (Event_after ty) info in
           let cont1 = add_event ev cont in
diff -Nru jocaml-3.12.0/bytecomp/bytelink.ml jocaml-3.12.1/bytecomp/bytelink.ml
--- jocaml-3.12.0/bytecomp/bytelink.ml	2010-06-04 19:16:52.000000000 +0000
+++ jocaml-3.12.1/bytecomp/bytelink.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: bytelink.ml 10506 2010-06-04 19:16:52Z maranget $ *)
+(* $Id: bytelink.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Link a set of .cmo files and produce a bytecode executable. *)
 
@@ -407,15 +407,15 @@
   begin try
     (* The bytecode *)
     output_string outchan "\
-#ifdef __cplusplus\n\
-extern \"C\" {\n\
-#endif\n\
-#include <caml/mlvalues.h>\n\
-CAMLextern void caml_startup_code(\n\
-           code_t code, asize_t code_size,\n\
-           char *data, asize_t data_size,\n\
-           char *section_table, asize_t section_table_size,\n\
-           char **argv);\n";
+#ifdef __cplusplus\
+\nextern \"C\" {\
+\n#endif\
+\n#include <caml/mlvalues.h>\
+\nCAMLextern void caml_startup_code(\
+\n           code_t code, asize_t code_size,\
+\n           char *data, asize_t data_size,\
+\n           char *section_table, asize_t section_table_size,\
+\n           char **argv);\n";
     output_string outchan "static int caml_code[] = {\n";
     Symtable.init();
     Consistbl.clear crc_interfaces;
@@ -444,17 +444,17 @@
     (* The table of primitives *)
     Symtable.output_primitive_table outchan;
     (* The entry point *)
-    output_string outchan "\n\
-void caml_startup(char ** argv)\n\
-{\n\
-  caml_startup_code(caml_code, sizeof(caml_code),\n\
-                    caml_data, sizeof(caml_data),\n\
-                    caml_sections, sizeof(caml_sections),\n\
-                    argv);\n\
-}\n\
-#ifdef __cplusplus\n\
-}\n\
-#endif\n";
+    output_string outchan "\
+\nvoid caml_startup(char ** argv)\
+\n{\
+\n  caml_startup_code(caml_code, sizeof(caml_code),\
+\n                    caml_data, sizeof(caml_data),\
+\n                    caml_sections, sizeof(caml_sections),\
+\n                    argv);\
+\n}\
+\n#ifdef __cplusplus\
+\n}\
+\n#endif\n";
     close_out outchan
   with x ->
     close_out outchan;
diff -Nru jocaml-3.12.0/bytecomp/bytepackager.ml jocaml-3.12.1/bytecomp/bytepackager.ml
--- jocaml-3.12.0/bytecomp/bytepackager.ml	2010-06-04 19:16:52.000000000 +0000
+++ jocaml-3.12.1/bytecomp/bytepackager.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: bytepackager.ml 10506 2010-06-04 19:16:52Z maranget $ *)
+(* $Id: bytepackager.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* "Package" a set of .cmo files into one .cmo file having the
    original compilation units as sub-modules. *)
@@ -39,7 +39,7 @@
    SETGLOBAL relocations that correspond to one of the units being
    consolidated. *)
 
-let rename_relocation objfile mapping defined base (rel, ofs) =
+let rename_relocation packagename objfile mapping defined base (rel, ofs) =
   let rel' =
     match rel with
       Reloc_getglobal id ->
@@ -49,7 +49,14 @@
           then Reloc_getglobal id'
           else raise(Error(Forward_reference(objfile, id)))
         with Not_found ->
-          rel
+          (* PR#5276: unique-ize dotted global names, which appear
+             if one of the units being consolidated is itself a packed
+             module. *)
+          let name = Ident.name id in
+          if String.contains name '.' then
+            Reloc_getglobal (Ident.create_persistent (packagename ^ "." ^ name))
+          else
+            rel
         end
     | Reloc_setglobal id ->
         begin try
@@ -58,7 +65,12 @@
           then raise(Error(Multiple_definition(objfile, id)))
           else Reloc_setglobal id'
         with Not_found ->
-          rel
+          (* PR#5276, as above *)
+          let name = Ident.name id in
+          if String.contains name '.' then
+	    Reloc_setglobal (Ident.create_persistent (packagename ^ "." ^ name))
+          else
+            rel
         end
     | _ ->
         rel in
@@ -112,12 +124,12 @@
    Accumulate relocs, debug info, etc.
    Return size of bytecode. *)
 
-let rename_append_bytecode oc mapping defined ofs prefix subst objfile compunit =
+let rename_append_bytecode packagename oc mapping defined ofs prefix subst objfile compunit =
   let ic = open_in_bin objfile in
   try
     Bytelink.check_consistency objfile compunit;
     List.iter
-      (rename_relocation objfile mapping defined ofs)
+      (rename_relocation packagename objfile mapping defined ofs)
       compunit.cu_reloc;
     primitives := compunit.cu_primitives @ !primitives;
     if compunit.cu_force_link then force_link := true;
@@ -136,20 +148,20 @@
 (* Same, for a list of .cmo and .cmi files.
    Return total size of bytecode. *)
 
-let rec rename_append_bytecode_list oc mapping defined ofs prefix subst = function
+let rec rename_append_bytecode_list packagename oc mapping defined ofs prefix subst = function
     [] ->
       ofs
   | m :: rem ->
       match m.pm_kind with
       | PM_intf ->
-          rename_append_bytecode_list oc mapping defined ofs prefix subst rem
+          rename_append_bytecode_list packagename oc mapping defined ofs prefix subst rem
       | PM_impl compunit ->
           let size =
-            rename_append_bytecode oc mapping defined ofs prefix subst
+            rename_append_bytecode packagename oc mapping defined ofs prefix subst
                                    m.pm_file compunit in
           let id = Ident.create_persistent m.pm_name in
           let root = Path.Pident (Ident.create_persistent prefix) in
-          rename_append_bytecode_list
+          rename_append_bytecode_list packagename
             oc mapping (id :: defined)
             (ofs + size) prefix (Subst.add_module id (Path.Pdot (root, Ident.name id, Path.nopos)) subst) rem
 
@@ -191,7 +203,7 @@
     let pos_depl = pos_out oc in
     output_binary_int oc 0;
     let pos_code = pos_out oc in
-    let ofs = rename_append_bytecode_list oc mapping [] 0 targetname Subst.identity members in
+    let ofs = rename_append_bytecode_list targetname oc mapping [] 0 targetname Subst.identity members in
     build_global_target oc targetname members mapping ofs coercion;
     let pos_debug = pos_out oc in
     if !Clflags.debug && !events <> [] then
diff -Nru jocaml-3.12.0/bytecomp/lambda.ml jocaml-3.12.1/bytecomp/lambda.ml
--- jocaml-3.12.0/bytecomp/lambda.ml	2010-06-04 19:16:52.000000000 +0000
+++ jocaml-3.12.1/bytecomp/lambda.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: lambda.ml 10506 2010-06-04 19:16:52Z maranget $ *)
+(* $Id: lambda.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 open Misc
 open Path
@@ -140,7 +140,7 @@
   | Lwhile of lambda * lambda
   | Lfor of Ident.t * lambda * lambda * direction_flag * lambda
   | Lassign of Ident.t * lambda
-  | Lsend of meth_kind * lambda * lambda * lambda list
+  | Lsend of meth_kind * lambda * lambda * lambda list * Location.t
   | Levent of lambda * lambda_event
   | Lifused of Ident.t * lambda
 
@@ -202,7 +202,7 @@
       same b1 b2 && df1 = df2 && same c1 c2
   | Lassign(id1, a1), Lassign(id2, a2) ->
       Ident.same id1 id2 && same a1 a2
-  | Lsend(k1, a1, b1, cl1), Lsend(k2, a2, b2, cl2) ->
+  | Lsend(k1, a1, b1, cl1, _), Lsend(k2, a2, b2, cl2, _) ->
       k1 = k2 && same a1 a2 && same b1 b2 && samelist same cl1 cl2
   | Levent(a1, ev1), Levent(a2, ev2) ->
       same a1 a2 && ev1.lev_loc = ev2.lev_loc
@@ -278,7 +278,7 @@
       f e1; f e2; f e3
   | Lassign(id, e) ->
       f e
-  | Lsend (k, met, obj, args) ->
+  | Lsend (k, met, obj, args, _) ->
       List.iter f (met::obj::args)
   | Levent (lam, evt) ->
       f lam
@@ -321,7 +321,7 @@
   free_ids (function Lvar id -> [id] | _ -> []) l
 
 let free_methods l =
-  free_ids (function Lsend(Self, Lvar meth, obj, _) -> [meth] | _ -> []) l
+  free_ids (function Lsend(Self, Lvar meth, obj, _, _) -> [meth] | _ -> []) l
 
 (* Check if an action has a "when" guard *)
 let raise_count = ref 0
@@ -399,8 +399,8 @@
   | Lwhile(e1, e2) -> Lwhile(subst e1, subst e2)
   | Lfor(v, e1, e2, dir, e3) -> Lfor(v, subst e1, subst e2, dir, subst e3)
   | Lassign(id, e) -> Lassign(id, subst e)
-  | Lsend (k, met, obj, args) ->
-      Lsend (k, subst met, subst obj, List.map subst args)
+  | Lsend (k, met, obj, args, loc) ->
+      Lsend (k, subst met, subst obj, List.map subst args, loc)
   | Levent (lam, evt) -> Levent (subst lam, evt)
   | Lifused (v, e) -> Lifused (v, subst e)
   and subst_decl (id, exp) = (id, subst exp)
diff -Nru jocaml-3.12.0/bytecomp/lambda.mli jocaml-3.12.1/bytecomp/lambda.mli
--- jocaml-3.12.0/bytecomp/lambda.mli	2010-06-04 19:16:52.000000000 +0000
+++ jocaml-3.12.1/bytecomp/lambda.mli	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: lambda.mli 10506 2010-06-04 19:16:52Z maranget $ *)
+(* $Id: lambda.mli 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* The "lambda" intermediate code *)
 
@@ -149,7 +149,7 @@
   | Lwhile of lambda * lambda
   | Lfor of Ident.t * lambda * lambda * direction_flag * lambda
   | Lassign of Ident.t * lambda
-  | Lsend of meth_kind * lambda * lambda * lambda list
+  | Lsend of meth_kind * lambda * lambda * lambda list * Location.t
   | Levent of lambda * lambda_event
   | Lifused of Ident.t * lambda
 
diff -Nru jocaml-3.12.0/bytecomp/printlambda.ml jocaml-3.12.1/bytecomp/printlambda.ml
--- jocaml-3.12.0/bytecomp/printlambda.ml	2008-10-14 07:37:28.000000000 +0000
+++ jocaml-3.12.1/bytecomp/printlambda.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: printlambda.ml 9081 2008-10-14 07:37:28Z maranget $ *)
+(* $Id: printlambda.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 open Format
 open Asttypes
@@ -285,7 +285,7 @@
        lam hi lam body
   | Lassign(id, expr) ->
       fprintf ppf "@[<2>(assign@ %a@ %a)@]" Ident.print id lam expr
-  | Lsend (k, met, obj, largs) ->
+  | Lsend (k, met, obj, largs, _) ->
       let args ppf largs =
         List.iter (fun l -> fprintf ppf "@ %a" lam l) largs in
       let kind =
diff -Nru jocaml-3.12.0/bytecomp/simplif.ml jocaml-3.12.1/bytecomp/simplif.ml
--- jocaml-3.12.0/bytecomp/simplif.ml	2010-06-04 19:16:52.000000000 +0000
+++ jocaml-3.12.1/bytecomp/simplif.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: simplif.ml 10506 2010-06-04 19:16:52Z maranget $ *)
+(* $Id: simplif.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Elimination of useless Llet(Alias) bindings.
    Also transform let-bound references into variables. *)
@@ -75,9 +75,9 @@
            dir, eliminate_ref id e3)
   | Lassign(v, e) ->
       Lassign(v, eliminate_ref id e)
-  | Lsend(k, m, o, el) ->
+  | Lsend(k, m, o, el, loc) ->
       Lsend(k, eliminate_ref id m, eliminate_ref id o,
-            List.map (eliminate_ref id) el)
+            List.map (eliminate_ref id) el, loc)
   | Levent(l, ev) ->
       Levent(eliminate_ref id l, ev)
   | Lifused(v, e) ->
@@ -144,7 +144,7 @@
       (* Lalias-bound variables are never assigned, so don't increase
          v's refcount *)
       count l
-  | Lsend(k, m, o, ll) -> List.iter count (m::o::ll)
+  | Lsend(k, m, o, ll, _) -> List.iter count (m::o::ll)
   | Levent(l, _) -> count l
   | Lifused(v, l) -> count l
 
@@ -250,7 +250,7 @@
   | Lfor(v, l1, l2, dir, l3) ->
       Lfor(v, simplif l1, simplif l2, dir, simplif l3)
   | Lassign(v, l) -> Lassign(v, simplif l)
-  | Lsend(k, m, o, ll) -> Lsend(k, simplif m, simplif o, List.map simplif ll)
+  | Lsend(k, m, o, ll, loc) -> Lsend(k, simplif m, simplif o, List.map simplif ll, loc)
   | Levent(l, ev) -> Levent(simplif l, ev)
   | Lifused(v, l) -> Lifused (v,simplif l)
   in
@@ -313,7 +313,7 @@
       (* Lalias-bound variables are never assigned, so don't increase
          v's refcount *)
       count l
-  | Lsend(_, m, o, ll) -> List.iter count (m::o::ll)
+  | Lsend(_, m, o, ll, _) -> List.iter count (m::o::ll)
   | Levent(l, _) -> count l
   | Lifused(v, l) ->
       if count_var v > 0 then count l
@@ -402,11 +402,93 @@
   | Lfor(v, l1, l2, dir, l3) ->
       Lfor(v, simplif l1, simplif l2, dir, simplif l3)
   | Lassign(v, l) -> Lassign(v, simplif l)
-  | Lsend(k, m, o, ll) -> Lsend(k, simplif m, simplif o, List.map simplif ll)
+  | Lsend(k, m, o, ll, loc) -> Lsend(k, simplif m, simplif o, List.map simplif ll, loc)
   | Levent(l, ev) -> Levent(simplif l, ev)
   | Lifused(v, l) ->
       if count_var v > 0 then simplif l else lambda_unit
   in
   simplif lam
 
-let simplify_lambda lam = simplify_lets (simplify_exits lam)
+(* Tail call info in annotation files *)
+
+let is_tail_native_heuristic : (int -> bool) ref =
+  ref (fun n -> true)
+
+let rec emit_tail_infos is_tail lambda =
+  let call_kind args =
+    if is_tail
+    && ((not !Clflags.native_code)
+        || (!is_tail_native_heuristic (List.length args)))
+   then Annot.Tail
+   else Annot.Stack in
+  match lambda with
+  | Lvar _ -> ()
+  | Lconst _ -> ()
+  | Lapply (func, l, loc) ->
+      list_emit_tail_infos false l;
+      Stypes.record (Stypes.An_call (loc, call_kind l))
+  | Lfunction (_, _, lam) ->
+      emit_tail_infos true lam
+  | Llet (_, _, lam, body) ->
+      emit_tail_infos false lam;
+      emit_tail_infos is_tail body
+  | Lletrec (bindings, body) ->
+      List.iter (fun (_, lam) -> emit_tail_infos false lam) bindings;
+      emit_tail_infos is_tail body
+  | Lprim (Pidentity, [arg]) ->
+      emit_tail_infos is_tail arg
+  | Lprim (Psequand, [arg1; arg2])
+  | Lprim (Psequor, [arg1; arg2]) ->
+      emit_tail_infos false arg1;
+      emit_tail_infos is_tail arg2
+  | Lprim (_, l) ->
+      list_emit_tail_infos false l
+  | Lswitch (lam, sw) ->
+      emit_tail_infos false lam;
+      list_emit_tail_infos_fun snd is_tail sw.sw_consts;
+      list_emit_tail_infos_fun snd is_tail sw.sw_blocks
+  | Lstaticraise (_, l) ->
+      list_emit_tail_infos false l
+  | Lstaticcatch (body, _, handler) ->
+      emit_tail_infos is_tail body;
+      emit_tail_infos is_tail handler
+  | Ltrywith (body, _, handler) ->
+      emit_tail_infos false body;
+      emit_tail_infos is_tail handler
+  | Lifthenelse (cond, ifso, ifno) ->
+      emit_tail_infos false cond;
+      emit_tail_infos is_tail ifso;
+      emit_tail_infos is_tail ifno
+  | Lsequence (lam1, lam2) ->
+      emit_tail_infos false lam1;
+      emit_tail_infos is_tail lam2
+  | Lwhile (cond, body) ->
+      emit_tail_infos false cond;
+      emit_tail_infos false body
+  | Lfor (_, low, high, _, body) ->
+      emit_tail_infos false low;
+      emit_tail_infos false high;
+      emit_tail_infos false body
+  | Lassign (_, lam) ->
+      emit_tail_infos false lam
+  | Lsend (_, meth, obj, args, loc) ->
+      emit_tail_infos false meth;
+      emit_tail_infos false obj;
+      list_emit_tail_infos false args;
+      Stypes.record (Stypes.An_call (loc, call_kind (obj :: args)))
+  | Levent (lam, _) ->
+      emit_tail_infos is_tail lam
+  | Lifused (_, lam) ->
+      emit_tail_infos is_tail lam
+and list_emit_tail_infos_fun f is_tail =
+  List.iter (fun x -> emit_tail_infos is_tail (f x))
+and list_emit_tail_infos is_tail =
+  List.iter (emit_tail_infos is_tail)
+
+(* The entry point:
+   simplification + emission of tailcall annotations, if needed. *)
+
+let simplify_lambda lam =
+  let res = simplify_lets (simplify_exits lam) in
+  if !Clflags.annotations then emit_tail_infos true res;
+  res
diff -Nru jocaml-3.12.0/bytecomp/simplif.mli jocaml-3.12.1/bytecomp/simplif.mli
--- jocaml-3.12.0/bytecomp/simplif.mli	1999-11-17 18:59:06.000000000 +0000
+++ jocaml-3.12.1/bytecomp/simplif.mli	2011-07-07 14:32:00.000000000 +0000
@@ -10,10 +10,17 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: simplif.mli 2553 1999-11-17 18:59:06Z xleroy $ *)
+(* $Id: simplif.mli 11113 2011-07-07 14:32:00Z maranget $ *)
 
-(* Elimination of useless Llet(Alias) bindings *)
+(* Elimination of useless Llet(Alias) bindings.
+   Transformation of let-bound references into variables.
+   Simplification over staticraise/staticcatch constructs.
+   Generation of tail-call annotations if -annot is set. *)
 
 open Lambda
 
 val simplify_lambda: lambda -> lambda
+
+(* To be filled by asmcomp/selectgen.ml *)
+val is_tail_native_heuristic: (int -> bool) ref
+                          (* # arguments -> can tailcall *)
diff -Nru jocaml-3.12.0/bytecomp/translclass.ml jocaml-3.12.1/bytecomp/translclass.ml
--- jocaml-3.12.0/bytecomp/translclass.ml	2009-08-21 08:39:33.000000000 +0000
+++ jocaml-3.12.1/bytecomp/translclass.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: translclass.ml 9322 2009-08-21 08:39:33Z maranget $ *)
+(* $Id: translclass.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 open Misc
 open Asttypes
@@ -497,7 +497,7 @@
         "var", [Lvar n]
     | Lprim(Pfield n, [Lvar e]) when Ident.same e env ->
         "env", [Lvar env2; Lconst(Const_pointer n)]
-    | Lsend(Self, met, Lvar s, []) when List.mem s self ->
+    | Lsend(Self, met, Lvar s, [], _) when List.mem s self ->
         "meth", [met]
     | _ -> raise Not_found
   in
@@ -512,15 +512,15 @@
   | Lapply(f, [p; arg], _) when const_path f && const_path p ->
       let s, args = conv arg in
       ("app_const_"^s, f :: p :: args)
-  | Lsend(Self, Lvar n, Lvar s, [arg]) when List.mem s self ->
+  | Lsend(Self, Lvar n, Lvar s, [arg], _) when List.mem s self ->
       let s, args = conv arg in
       ("meth_app_"^s, Lvar n :: args)
-  | Lsend(Self, met, Lvar s, []) when List.mem s self ->
+  | Lsend(Self, met, Lvar s, [], _) when List.mem s self ->
       ("get_meth", [met])
-  | Lsend(Public, met, arg, []) ->
+  | Lsend(Public, met, arg, [], _) ->
       let s, args = conv arg in
       ("send_"^s, met :: args)
-  | Lsend(Cached, met, arg, [_;_]) ->
+  | Lsend(Cached, met, arg, [_;_], _) ->
       let s, args = conv arg in
       ("send_"^s, met :: args)
   | Lfunction (Curried, [x], body) ->
diff -Nru jocaml-3.12.0/bytecomp/translcore.ml jocaml-3.12.1/bytecomp/translcore.ml
--- jocaml-3.12.0/bytecomp/translcore.ml	2010-06-04 19:16:52.000000000 +0000
+++ jocaml-3.12.1/bytecomp/translcore.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: translcore.ml 10506 2010-06-04 19:16:52Z maranget $ *)
+(* $Id: translcore.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Translation from typed abstract syntax to lambda terms,
    for the core language *)
@@ -604,12 +604,12 @@
       if public_send || p.prim_name = "%sendself" then
         let kind = if public_send then Public else Self in
         let obj = Ident.create "obj" and meth = Ident.create "meth" in
-        Lfunction(Curried, [obj; meth], Lsend(kind, Lvar meth, Lvar obj, []))
+        Lfunction(Curried, [obj; meth], Lsend(kind, Lvar meth, Lvar obj, [], e.exp_loc))
       else if p.prim_name = "%sendcache" then
         let obj = Ident.create "obj" and meth = Ident.create "meth" in
         let cache = Ident.create "cache" and pos = Ident.create "pos" in
         Lfunction(Curried, [obj; meth; cache; pos],
-                  Lsend(Cached, Lvar meth, Lvar obj, [Lvar cache; Lvar pos]))
+                  Lsend(Cached, Lvar meth, Lvar obj, [Lvar cache; Lvar pos], e.exp_loc))
       else
         transl_primitive p
   | Texp_ident(path, {val_kind = Val_anc _}) ->
@@ -669,10 +669,10 @@
       if public_send || p.prim_name = "%sendself" then
         let kind = if public_send then Public else Self in
         let obj = List.hd argl in
-        wrap (Lsend (kind, List.nth argl 1, obj, []))
+        wrap (Lsend (kind, List.nth argl 1, obj, [], e.exp_loc))
       else if p.prim_name = "%sendcache" then
         match argl with [obj; meth; cache; pos] ->
-          wrap (Lsend(Cached, meth, obj, [cache; pos]))
+          wrap (Lsend(Cached, meth, obj, [cache; pos], e.exp_loc))
         | _ -> assert false
       else begin
         let prim = transl_prim p args in
@@ -798,11 +798,11 @@
       let obj = transl_exp expr in
       let lam =
         match met with
-          Tmeth_val id -> Lsend (Self, Lvar id, obj, [])
+          Tmeth_val id -> Lsend (Self, Lvar id, obj, [], e.exp_loc)
         | Tmeth_name nm ->
             let (tag, cache) = Translobj.meth obj nm in
             let kind = if cache = [] then Public else Cached in
-            Lsend (kind, tag, obj, cache)
+            Lsend (kind, tag, obj, cache, e.exp_loc)
       in
       event_after e lam
   | Texp_new (cl, _) ->
@@ -1206,10 +1206,10 @@
 and transl_apply lam sargs loc =
   let lapply funct args =
     match funct with
-      Lsend(k, lmet, lobj, largs) ->
-        Lsend(k, lmet, lobj, largs @ args)
-    | Levent(Lsend(k, lmet, lobj, largs), _) ->
-        Lsend(k, lmet, lobj, largs @ args)
+      Lsend(k, lmet, lobj, largs, loc) ->
+        Lsend(k, lmet, lobj, largs @ args, loc)
+    | Levent(Lsend(k, lmet, lobj, largs, loc), _) ->
+        Lsend(k, lmet, lobj, largs @ args, loc)
     | Lapply(lexp, largs, _) ->
         Lapply(lexp, largs @ args, loc)
     | lexp ->
diff -Nru jocaml-3.12.0/byterun/compare.c jocaml-3.12.1/byterun/compare.c
--- jocaml-3.12.0/byterun/compare.c	2008-10-14 07:37:28.000000000 +0000
+++ jocaml-3.12.1/byterun/compare.c	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: compare.c 9081 2008-10-14 07:37:28Z maranget $ */
+/* $Id: compare.c 11113 2011-07-07 14:32:00Z maranget $ */
 
 #include <string.h>
 #include <stdlib.h>
@@ -104,18 +104,44 @@
       if (Is_long(v2))
         return Long_val(v1) - Long_val(v2);
       /* Subtraction above cannot overflow and cannot result in UNORDERED */
-      if (Is_in_value_area(v2) &&
-          Tag_val(v2) == Forward_tag) {
-        v2 = Forward_val(v2);
-        continue;
+      if (Is_in_value_area(v2)) {
+        switch (Tag_val(v2)) {
+        case Forward_tag: 
+          v2 = Forward_val(v2);
+          continue;
+        case Custom_tag: {
+          int res;
+          int (*compare)(value v1, value v2) = Custom_ops_val(v2)->compare_ext;
+          if (compare == NULL) break;  /* for backward compatibility */
+          caml_compare_unordered = 0;
+          res = compare(v1, v2);
+          if (caml_compare_unordered && !total) return UNORDERED;
+          if (res != 0) return res;
+          goto next_item;
+        }
+        default: /*fallthrough*/;
+        }
       }
       return LESS;                /* v1 long < v2 block */
     }
     if (Is_long(v2)) {
-      if (Is_in_value_area(v1) &&
-          Tag_val(v1) == Forward_tag) {
-        v1 = Forward_val(v1);
-        continue;
+      if (Is_in_value_area(v1)) {
+        switch (Tag_val(v1)) {
+        case Forward_tag:
+          v1 = Forward_val(v1);
+          continue;
+        case Custom_tag: {
+          int res;
+          int (*compare)(value v1, value v2) = Custom_ops_val(v1)->compare_ext;
+          if (compare == NULL) break;  /* for backward compatibility */
+          caml_compare_unordered = 0;
+          res = compare(v1, v2);
+          if (caml_compare_unordered && !total) return UNORDERED;
+          if (res != 0) return res;
+          goto next_item;
+        }
+        default: /*fallthrough*/;
+        }
       }
       return GREATER;            /* v1 block > v2 long */
     }
@@ -134,17 +160,14 @@
     if (t1 != t2) return (intnat)t1 - (intnat)t2;
     switch(t1) {
     case String_tag: {
-      mlsize_t len1, len2, len;
-      unsigned char * p1, * p2;
+      mlsize_t len1, len2;
+      int res;
       if (v1 == v2) break;
       len1 = caml_string_length(v1);
       len2 = caml_string_length(v2);
-      for (len = (len1 <= len2 ? len1 : len2),
-             p1 = (unsigned char *) String_val(v1),
-             p2 = (unsigned char *) String_val(v2);
-           len > 0;
-           len--, p1++, p2++)
-        if (*p1 != *p2) return (intnat)*p1 - (intnat)*p2;
+      res = memcmp(String_val(v1), String_val(v2), len1 <= len2 ? len1 : len2);
+      if (res < 0) return LESS;
+      if (res > 0) return GREATER;
       if (len1 != len2) return len1 - len2;
       break;
     }
@@ -198,12 +221,18 @@
     case Custom_tag: {
       int res;
       int (*compare)(value v1, value v2) = Custom_ops_val(v1)->compare;
+      /* Hardening against comparisons between different types */
+      if (compare != Custom_ops_val(v2)->compare) {
+        return strcmp(Custom_ops_val(v1)->identifier,
+                      Custom_ops_val(v2)->identifier) < 0
+               ? LESS : GREATER;
+      }
       if (compare == NULL) {
         compare_free_stack();
         caml_invalid_argument("equal: abstract value");
       }
       caml_compare_unordered = 0;
-      res = Custom_ops_val(v1)->compare(v1, v2);
+      res = compare(v1, v2);
       if (caml_compare_unordered && !total) return UNORDERED;
       if (res != 0) return res;
       break;
diff -Nru jocaml-3.12.0/byterun/config.h jocaml-3.12.1/byterun/config.h
--- jocaml-3.12.0/byterun/config.h	2009-08-21 08:39:33.000000000 +0000
+++ jocaml-3.12.1/byterun/config.h	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: config.h 9322 2009-08-21 08:39:33Z maranget $ */
+/* $Id: config.h 11113 2011-07-07 14:32:00Z maranget $ */
 
 #ifndef CAML_CONFIG_H
 #define CAML_CONFIG_H
@@ -135,7 +135,7 @@
 #define Minor_heap_max (1 << 28)
 
 /* Default size of the minor zone. (words)  */
-#define Minor_heap_def 32768
+#define Minor_heap_def 262144
 
 
 /* Minimum size increment when growing the heap (words).
diff -Nru jocaml-3.12.0/byterun/custom.h jocaml-3.12.1/byterun/custom.h
--- jocaml-3.12.0/byterun/custom.h	2010-06-04 19:16:46.000000000 +0000
+++ jocaml-3.12.1/byterun/custom.h	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: custom.h 10505 2010-06-04 19:16:46Z maranget $ */
+/* $Id: custom.h 11113 2011-07-07 14:32:00Z maranget $ */
 
 #ifndef CAML_CUSTOM_H
 #define CAML_CUSTOM_H
@@ -31,6 +31,7 @@
                     /*out*/ uintnat * wsize_32 /*size in bytes*/,
                     /*out*/ uintnat * wsize_64 /*size in bytes*/);
   uintnat (*deserialize)(void * dst);
+  int (*compare_ext)(value v1, value v2);
 };
 
 #define custom_finalize_default NULL
@@ -38,6 +39,7 @@
 #define custom_hash_default NULL
 #define custom_serialize_default NULL
 #define custom_deserialize_default NULL
+#define custom_compare_ext_default NULL
 
 #define Custom_ops_val(v) (*((struct custom_operations **) (v)))
 
diff -Nru jocaml-3.12.0/byterun/.depend jocaml-3.12.1/byterun/.depend
--- jocaml-3.12.0/byterun/.depend	2010-09-06 13:32:53.000000000 +0000
+++ jocaml-3.12.1/byterun/.depend	2011-07-07 14:32:00.000000000 +0000
@@ -1,416 +1,407 @@
 alloc.o: alloc.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h custom.h major_gc.h freelist.h memory.h gc.h \
-  minor_gc.h stacks.h
+ ../config/s.h mlvalues.h custom.h major_gc.h freelist.h memory.h gc.h \
+ minor_gc.h stacks.h
 array.o: array.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h memory.h gc.h major_gc.h freelist.h \
-  minor_gc.h
+ ../config/s.h mlvalues.h fail.h memory.h gc.h major_gc.h freelist.h \
+ minor_gc.h
 backtrace.o: backtrace.c config.h ../config/m.h ../config/s.h \
-  compatibility.h mlvalues.h misc.h alloc.h io.h instruct.h intext.h \
-  fix_code.h exec.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
-  startup.h stacks.h sys.h backtrace.h
+ compatibility.h mlvalues.h misc.h alloc.h io.h instruct.h intext.h \
+ fix_code.h exec.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
+ startup.h stacks.h sys.h backtrace.h
 callback.o: callback.c callback.h compatibility.h mlvalues.h config.h \
-  ../config/m.h ../config/s.h misc.h fail.h memory.h gc.h major_gc.h \
-  freelist.h minor_gc.h interp.h instruct.h fix_code.h stacks.h
+ ../config/m.h ../config/s.h misc.h fail.h memory.h gc.h major_gc.h \
+ freelist.h minor_gc.h interp.h instruct.h fix_code.h stacks.h
 compact.o: compact.c config.h ../config/m.h ../config/s.h compatibility.h \
-  finalise.h roots.h misc.h memory.h gc.h mlvalues.h major_gc.h \
-  freelist.h minor_gc.h gc_ctrl.h weak.h
+ finalise.h roots.h misc.h memory.h gc.h mlvalues.h major_gc.h freelist.h \
+ minor_gc.h gc_ctrl.h weak.h
 compare.o: compare.c custom.h compatibility.h mlvalues.h config.h \
-  ../config/m.h ../config/s.h misc.h fail.h memory.h gc.h major_gc.h \
-  freelist.h minor_gc.h
+ ../config/m.h ../config/s.h misc.h fail.h memory.h gc.h major_gc.h \
+ freelist.h minor_gc.h
 custom.o: custom.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h custom.h fail.h memory.h gc.h major_gc.h \
-  freelist.h minor_gc.h
+ ../config/s.h mlvalues.h custom.h fail.h memory.h gc.h major_gc.h \
+ freelist.h minor_gc.h
 debugger.o: debugger.c config.h ../config/m.h ../config/s.h \
-  compatibility.h debugger.h misc.h mlvalues.h fail.h fix_code.h \
-  instruct.h intext.h io.h stacks.h memory.h gc.h major_gc.h freelist.h \
-  minor_gc.h sys.h
+ compatibility.h debugger.h misc.h mlvalues.h fail.h fix_code.h \
+ instruct.h intext.h io.h stacks.h memory.h gc.h major_gc.h freelist.h \
+ minor_gc.h sys.h
 dynlink.o: dynlink.c config.h ../config/m.h ../config/s.h compatibility.h \
-  alloc.h misc.h mlvalues.h dynlink.h fail.h memory.h gc.h major_gc.h \
-  freelist.h minor_gc.h osdeps.h prims.h
+ alloc.h misc.h mlvalues.h dynlink.h fail.h memory.h gc.h major_gc.h \
+ freelist.h minor_gc.h osdeps.h prims.h
 extern.o: extern.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h custom.h fail.h gc.h intext.h io.h fix_code.h \
-  memory.h major_gc.h freelist.h minor_gc.h reverse.h
+ ../config/s.h mlvalues.h custom.h fail.h gc.h intext.h io.h fix_code.h \
+ memory.h major_gc.h freelist.h minor_gc.h reverse.h
 fail.o: fail.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h io.h gc.h memory.h major_gc.h \
-  freelist.h minor_gc.h printexc.h signals.h stacks.h
+ ../config/s.h mlvalues.h fail.h io.h gc.h memory.h major_gc.h freelist.h \
+ minor_gc.h printexc.h signals.h stacks.h
 finalise.o: finalise.c callback.h compatibility.h mlvalues.h config.h \
-  ../config/m.h ../config/s.h misc.h fail.h roots.h memory.h gc.h \
-  major_gc.h freelist.h minor_gc.h signals.h
+ ../config/m.h ../config/s.h misc.h fail.h roots.h memory.h gc.h \
+ major_gc.h freelist.h minor_gc.h signals.h
 fix_code.o: fix_code.c config.h ../config/m.h ../config/s.h \
-  compatibility.h debugger.h misc.h mlvalues.h fix_code.h instruct.h \
-  md5.h io.h memory.h gc.h major_gc.h freelist.h minor_gc.h reverse.h
+ compatibility.h debugger.h misc.h mlvalues.h fix_code.h instruct.h md5.h \
+ io.h memory.h gc.h major_gc.h freelist.h minor_gc.h reverse.h
 floats.o: floats.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h memory.h gc.h major_gc.h freelist.h \
-  minor_gc.h reverse.h stacks.h
+ ../config/s.h mlvalues.h fail.h memory.h gc.h major_gc.h freelist.h \
+ minor_gc.h reverse.h stacks.h
 freelist.o: freelist.c config.h ../config/m.h ../config/s.h \
-  compatibility.h freelist.h misc.h mlvalues.h gc.h gc_ctrl.h memory.h \
-  major_gc.h minor_gc.h
+ compatibility.h freelist.h misc.h mlvalues.h gc.h gc_ctrl.h memory.h \
+ major_gc.h minor_gc.h
 gc_ctrl.o: gc_ctrl.c alloc.h compatibility.h misc.h config.h \
-  ../config/m.h ../config/s.h mlvalues.h compact.h custom.h finalise.h \
-  roots.h memory.h gc.h major_gc.h freelist.h minor_gc.h gc_ctrl.h \
-  stacks.h
+ ../config/m.h ../config/s.h mlvalues.h compact.h custom.h finalise.h \
+ roots.h memory.h gc.h major_gc.h freelist.h minor_gc.h gc_ctrl.h \
+ stacks.h
 globroots.o: globroots.c memory.h compatibility.h config.h ../config/m.h \
-  ../config/s.h gc.h mlvalues.h misc.h major_gc.h freelist.h minor_gc.h \
-  roots.h globroots.h
+ ../config/s.h gc.h mlvalues.h misc.h major_gc.h freelist.h minor_gc.h \
+ roots.h globroots.h
 hash.o: hash.c mlvalues.h compatibility.h config.h ../config/m.h \
-  ../config/s.h misc.h custom.h memory.h gc.h major_gc.h freelist.h \
-  minor_gc.h
+ ../config/s.h misc.h custom.h memory.h gc.h major_gc.h freelist.h \
+ minor_gc.h
 instrtrace.o: instrtrace.c
 intern.o: intern.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h custom.h fail.h gc.h intext.h io.h fix_code.h \
-  memory.h major_gc.h freelist.h minor_gc.h reverse.h
+ ../config/s.h mlvalues.h custom.h fail.h gc.h intext.h io.h fix_code.h \
+ memory.h major_gc.h freelist.h minor_gc.h reverse.h
 interp.o: interp.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h backtrace.h callback.h debugger.h fail.h \
-  fix_code.h instrtrace.h instruct.h interp.h major_gc.h freelist.h \
-  memory.h gc.h minor_gc.h prims.h signals.h stacks.h jumptbl.h
+ ../config/s.h mlvalues.h backtrace.h callback.h debugger.h fail.h \
+ fix_code.h instrtrace.h instruct.h interp.h major_gc.h freelist.h \
+ memory.h gc.h minor_gc.h prims.h signals.h stacks.h jumptbl.h
 ints.o: ints.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h custom.h fail.h intext.h io.h fix_code.h \
-  memory.h gc.h major_gc.h freelist.h minor_gc.h int64_native.h
+ ../config/s.h mlvalues.h custom.h fail.h intext.h io.h fix_code.h \
+ memory.h gc.h major_gc.h freelist.h minor_gc.h int64_native.h
 io.o: io.c config.h ../config/m.h ../config/s.h compatibility.h alloc.h \
-  misc.h mlvalues.h custom.h fail.h io.h memory.h gc.h major_gc.h \
-  freelist.h minor_gc.h signals.h sys.h
+ misc.h mlvalues.h custom.h fail.h io.h memory.h gc.h major_gc.h \
+ freelist.h minor_gc.h signals.h sys.h
 lexing.o: lexing.c fail.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h stacks.h memory.h gc.h major_gc.h freelist.h \
-  minor_gc.h
+ ../config/s.h mlvalues.h stacks.h memory.h gc.h major_gc.h freelist.h \
+ minor_gc.h
 main.o: main.c misc.h compatibility.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h sys.h
+ ../config/s.h mlvalues.h sys.h
 major_gc.o: major_gc.c compact.h config.h ../config/m.h ../config/s.h \
-  compatibility.h misc.h custom.h mlvalues.h fail.h finalise.h roots.h \
-  memory.h gc.h major_gc.h freelist.h minor_gc.h gc_ctrl.h weak.h
+ compatibility.h misc.h custom.h mlvalues.h fail.h finalise.h roots.h \
+ memory.h gc.h major_gc.h freelist.h minor_gc.h gc_ctrl.h weak.h
 md5.o: md5.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h md5.h io.h memory.h gc.h major_gc.h \
-  freelist.h minor_gc.h reverse.h
+ ../config/s.h mlvalues.h fail.h md5.h io.h memory.h gc.h major_gc.h \
+ freelist.h minor_gc.h reverse.h
 memory.o: memory.c fail.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h freelist.h gc.h gc_ctrl.h major_gc.h memory.h \
-  minor_gc.h signals.h
+ ../config/s.h mlvalues.h freelist.h gc.h gc_ctrl.h major_gc.h memory.h \
+ minor_gc.h signals.h
 meta.o: meta.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h fix_code.h interp.h intext.h io.h \
-  major_gc.h freelist.h memory.h gc.h minor_gc.h prims.h stacks.h
+ ../config/s.h mlvalues.h fail.h fix_code.h interp.h intext.h io.h \
+ major_gc.h freelist.h memory.h gc.h minor_gc.h prims.h stacks.h
 minor_gc.o: minor_gc.c config.h ../config/m.h ../config/s.h \
-  compatibility.h fail.h misc.h mlvalues.h finalise.h roots.h memory.h \
-  gc.h major_gc.h freelist.h minor_gc.h gc_ctrl.h signals.h weak.h
+ compatibility.h fail.h misc.h mlvalues.h finalise.h roots.h memory.h \
+ gc.h major_gc.h freelist.h minor_gc.h gc_ctrl.h signals.h weak.h
 misc.o: misc.c config.h ../config/m.h ../config/s.h compatibility.h \
-  misc.h memory.h gc.h mlvalues.h major_gc.h freelist.h minor_gc.h
+ misc.h memory.h gc.h mlvalues.h major_gc.h freelist.h minor_gc.h
 obj.o: obj.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h gc.h interp.h major_gc.h freelist.h \
-  memory.h minor_gc.h prims.h
+ ../config/s.h mlvalues.h fail.h gc.h interp.h major_gc.h freelist.h \
+ memory.h minor_gc.h prims.h
 parsing.o: parsing.c config.h ../config/m.h ../config/s.h compatibility.h \
-  mlvalues.h misc.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
-  alloc.h
+ mlvalues.h misc.h memory.h gc.h major_gc.h freelist.h minor_gc.h alloc.h
 prims.o: prims.c mlvalues.h compatibility.h config.h ../config/m.h \
-  ../config/s.h misc.h prims.h
+ ../config/s.h misc.h prims.h
 printexc.o: printexc.c backtrace.h mlvalues.h compatibility.h config.h \
-  ../config/m.h ../config/s.h misc.h callback.h debugger.h fail.h \
-  printexc.h
+ ../config/m.h ../config/s.h misc.h callback.h debugger.h fail.h \
+ printexc.h
 roots.o: roots.c finalise.h roots.h misc.h compatibility.h config.h \
-  ../config/m.h ../config/s.h memory.h gc.h mlvalues.h major_gc.h \
-  freelist.h minor_gc.h globroots.h stacks.h
-signals_byt.o: signals_byt.c config.h ../config/m.h ../config/s.h \
-  compatibility.h memory.h gc.h mlvalues.h misc.h major_gc.h freelist.h \
-  minor_gc.h osdeps.h signals.h signals_machdep.h
+ ../config/m.h ../config/s.h memory.h gc.h mlvalues.h major_gc.h \
+ freelist.h minor_gc.h globroots.h stacks.h
 signals.o: signals.c alloc.h compatibility.h misc.h config.h \
-  ../config/m.h ../config/s.h mlvalues.h callback.h fail.h memory.h gc.h \
-  major_gc.h freelist.h minor_gc.h roots.h signals.h signals_machdep.h \
-  sys.h
+ ../config/m.h ../config/s.h mlvalues.h callback.h fail.h memory.h gc.h \
+ major_gc.h freelist.h minor_gc.h roots.h signals.h signals_machdep.h \
+ sys.h
 signals_byt.o: signals_byt.c config.h ../config/m.h ../config/s.h \
-  compatibility.h memory.h gc.h mlvalues.h misc.h major_gc.h freelist.h \
-  minor_gc.h osdeps.h signals.h signals_machdep.h
+ compatibility.h memory.h gc.h mlvalues.h misc.h major_gc.h freelist.h \
+ minor_gc.h osdeps.h signals.h signals_machdep.h
 stacks.o: stacks.c config.h ../config/m.h ../config/s.h compatibility.h \
-  fail.h misc.h mlvalues.h stacks.h memory.h gc.h major_gc.h freelist.h \
-  minor_gc.h
+ fail.h misc.h mlvalues.h stacks.h memory.h gc.h major_gc.h freelist.h \
+ minor_gc.h
 startup.o: startup.c config.h ../config/m.h ../config/s.h compatibility.h \
-  alloc.h misc.h mlvalues.h backtrace.h callback.h custom.h debugger.h \
-  dynlink.h exec.h fail.h fix_code.h freelist.h gc_ctrl.h instrtrace.h \
-  interp.h intext.h io.h memory.h gc.h major_gc.h minor_gc.h osdeps.h \
-  prims.h printexc.h reverse.h signals.h stacks.h sys.h startup.h \
-  version.h
+ alloc.h misc.h mlvalues.h backtrace.h callback.h custom.h debugger.h \
+ dynlink.h exec.h fail.h fix_code.h freelist.h gc_ctrl.h instrtrace.h \
+ interp.h intext.h io.h memory.h gc.h major_gc.h minor_gc.h osdeps.h \
+ prims.h printexc.h reverse.h signals.h stacks.h sys.h startup.h \
+ version.h
 str.o: str.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h
+ ../config/s.h mlvalues.h fail.h
 sys.o: sys.c config.h ../config/m.h ../config/s.h compatibility.h alloc.h \
-  misc.h mlvalues.h debugger.h fail.h instruct.h osdeps.h signals.h \
-  stacks.h memory.h gc.h major_gc.h freelist.h minor_gc.h sys.h
+ misc.h mlvalues.h debugger.h fail.h instruct.h osdeps.h signals.h \
+ stacks.h memory.h gc.h major_gc.h freelist.h minor_gc.h sys.h
 terminfo.o: terminfo.c config.h ../config/m.h ../config/s.h \
-  compatibility.h alloc.h misc.h mlvalues.h fail.h io.h
+ compatibility.h alloc.h misc.h mlvalues.h fail.h io.h
 unix.o: unix.c config.h ../config/m.h ../config/s.h compatibility.h \
-  memory.h gc.h mlvalues.h misc.h major_gc.h freelist.h minor_gc.h \
-  osdeps.h
+ memory.h gc.h mlvalues.h misc.h major_gc.h freelist.h minor_gc.h \
+ osdeps.h
 weak.o: weak.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h major_gc.h freelist.h memory.h gc.h \
-  minor_gc.h
+ ../config/s.h mlvalues.h fail.h major_gc.h freelist.h memory.h gc.h \
+ minor_gc.h
 alloc.d.o: alloc.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h custom.h major_gc.h freelist.h memory.h gc.h \
-  minor_gc.h stacks.h
+ ../config/s.h mlvalues.h custom.h major_gc.h freelist.h memory.h gc.h \
+ minor_gc.h stacks.h
 array.d.o: array.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h memory.h gc.h major_gc.h freelist.h \
-  minor_gc.h
+ ../config/s.h mlvalues.h fail.h memory.h gc.h major_gc.h freelist.h \
+ minor_gc.h
 backtrace.d.o: backtrace.c config.h ../config/m.h ../config/s.h \
-  compatibility.h mlvalues.h misc.h alloc.h io.h instruct.h intext.h \
-  fix_code.h exec.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
-  startup.h stacks.h sys.h backtrace.h
+ compatibility.h mlvalues.h misc.h alloc.h io.h instruct.h intext.h \
+ fix_code.h exec.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
+ startup.h stacks.h sys.h backtrace.h
 callback.d.o: callback.c callback.h compatibility.h mlvalues.h config.h \
-  ../config/m.h ../config/s.h misc.h fail.h memory.h gc.h major_gc.h \
-  freelist.h minor_gc.h interp.h instruct.h fix_code.h stacks.h
+ ../config/m.h ../config/s.h misc.h fail.h memory.h gc.h major_gc.h \
+ freelist.h minor_gc.h interp.h instruct.h fix_code.h stacks.h
 compact.d.o: compact.c config.h ../config/m.h ../config/s.h compatibility.h \
-  finalise.h roots.h misc.h memory.h gc.h mlvalues.h major_gc.h \
-  freelist.h minor_gc.h gc_ctrl.h weak.h
+ finalise.h roots.h misc.h memory.h gc.h mlvalues.h major_gc.h freelist.h \
+ minor_gc.h gc_ctrl.h weak.h
 compare.d.o: compare.c custom.h compatibility.h mlvalues.h config.h \
-  ../config/m.h ../config/s.h misc.h fail.h memory.h gc.h major_gc.h \
-  freelist.h minor_gc.h
+ ../config/m.h ../config/s.h misc.h fail.h memory.h gc.h major_gc.h \
+ freelist.h minor_gc.h
 custom.d.o: custom.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h custom.h fail.h memory.h gc.h major_gc.h \
-  freelist.h minor_gc.h
+ ../config/s.h mlvalues.h custom.h fail.h memory.h gc.h major_gc.h \
+ freelist.h minor_gc.h
 debugger.d.o: debugger.c config.h ../config/m.h ../config/s.h \
-  compatibility.h debugger.h misc.h mlvalues.h fail.h fix_code.h \
-  instruct.h intext.h io.h stacks.h memory.h gc.h major_gc.h freelist.h \
-  minor_gc.h sys.h
+ compatibility.h debugger.h misc.h mlvalues.h fail.h fix_code.h \
+ instruct.h intext.h io.h stacks.h memory.h gc.h major_gc.h freelist.h \
+ minor_gc.h sys.h
 dynlink.d.o: dynlink.c config.h ../config/m.h ../config/s.h compatibility.h \
-  alloc.h misc.h mlvalues.h dynlink.h fail.h memory.h gc.h major_gc.h \
-  freelist.h minor_gc.h osdeps.h prims.h
+ alloc.h misc.h mlvalues.h dynlink.h fail.h memory.h gc.h major_gc.h \
+ freelist.h minor_gc.h osdeps.h prims.h
 extern.d.o: extern.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h custom.h fail.h gc.h intext.h io.h fix_code.h \
-  memory.h major_gc.h freelist.h minor_gc.h reverse.h
+ ../config/s.h mlvalues.h custom.h fail.h gc.h intext.h io.h fix_code.h \
+ memory.h major_gc.h freelist.h minor_gc.h reverse.h
 fail.d.o: fail.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h io.h gc.h memory.h major_gc.h \
-  freelist.h minor_gc.h printexc.h signals.h stacks.h
+ ../config/s.h mlvalues.h fail.h io.h gc.h memory.h major_gc.h freelist.h \
+ minor_gc.h printexc.h signals.h stacks.h
 finalise.d.o: finalise.c callback.h compatibility.h mlvalues.h config.h \
-  ../config/m.h ../config/s.h misc.h fail.h roots.h memory.h gc.h \
-  major_gc.h freelist.h minor_gc.h signals.h
+ ../config/m.h ../config/s.h misc.h fail.h roots.h memory.h gc.h \
+ major_gc.h freelist.h minor_gc.h signals.h
 fix_code.d.o: fix_code.c config.h ../config/m.h ../config/s.h \
-  compatibility.h debugger.h misc.h mlvalues.h fix_code.h instruct.h \
-  md5.h io.h memory.h gc.h major_gc.h freelist.h minor_gc.h reverse.h
+ compatibility.h debugger.h misc.h mlvalues.h fix_code.h instruct.h md5.h \
+ io.h memory.h gc.h major_gc.h freelist.h minor_gc.h reverse.h
 floats.d.o: floats.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h memory.h gc.h major_gc.h freelist.h \
-  minor_gc.h reverse.h stacks.h
+ ../config/s.h mlvalues.h fail.h memory.h gc.h major_gc.h freelist.h \
+ minor_gc.h reverse.h stacks.h
 freelist.d.o: freelist.c config.h ../config/m.h ../config/s.h \
-  compatibility.h freelist.h misc.h mlvalues.h gc.h gc_ctrl.h memory.h \
-  major_gc.h minor_gc.h
+ compatibility.h freelist.h misc.h mlvalues.h gc.h gc_ctrl.h memory.h \
+ major_gc.h minor_gc.h
 gc_ctrl.d.o: gc_ctrl.c alloc.h compatibility.h misc.h config.h \
-  ../config/m.h ../config/s.h mlvalues.h compact.h custom.h finalise.h \
-  roots.h memory.h gc.h major_gc.h freelist.h minor_gc.h gc_ctrl.h \
-  stacks.h
+ ../config/m.h ../config/s.h mlvalues.h compact.h custom.h finalise.h \
+ roots.h memory.h gc.h major_gc.h freelist.h minor_gc.h gc_ctrl.h \
+ stacks.h
 globroots.d.o: globroots.c memory.h compatibility.h config.h ../config/m.h \
-  ../config/s.h gc.h mlvalues.h misc.h major_gc.h freelist.h minor_gc.h \
-  roots.h globroots.h
+ ../config/s.h gc.h mlvalues.h misc.h major_gc.h freelist.h minor_gc.h \
+ roots.h globroots.h
 hash.d.o: hash.c mlvalues.h compatibility.h config.h ../config/m.h \
-  ../config/s.h misc.h custom.h memory.h gc.h major_gc.h freelist.h \
-  minor_gc.h
+ ../config/s.h misc.h custom.h memory.h gc.h major_gc.h freelist.h \
+ minor_gc.h
 instrtrace.d.o: instrtrace.c instruct.h misc.h compatibility.h config.h \
-  ../config/m.h ../config/s.h mlvalues.h opnames.h prims.h stacks.h \
-  memory.h gc.h major_gc.h freelist.h minor_gc.h
+ ../config/m.h ../config/s.h mlvalues.h opnames.h prims.h stacks.h \
+ memory.h gc.h major_gc.h freelist.h minor_gc.h
 intern.d.o: intern.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h custom.h fail.h gc.h intext.h io.h fix_code.h \
-  memory.h major_gc.h freelist.h minor_gc.h reverse.h
+ ../config/s.h mlvalues.h custom.h fail.h gc.h intext.h io.h fix_code.h \
+ memory.h major_gc.h freelist.h minor_gc.h reverse.h
 interp.d.o: interp.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h backtrace.h callback.h debugger.h fail.h \
-  fix_code.h instrtrace.h instruct.h interp.h major_gc.h freelist.h \
-  memory.h gc.h minor_gc.h prims.h signals.h stacks.h
+ ../config/s.h mlvalues.h backtrace.h callback.h debugger.h fail.h \
+ fix_code.h instrtrace.h instruct.h interp.h major_gc.h freelist.h \
+ memory.h gc.h minor_gc.h prims.h signals.h stacks.h
 ints.d.o: ints.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h custom.h fail.h intext.h io.h fix_code.h \
-  memory.h gc.h major_gc.h freelist.h minor_gc.h int64_native.h
+ ../config/s.h mlvalues.h custom.h fail.h intext.h io.h fix_code.h \
+ memory.h gc.h major_gc.h freelist.h minor_gc.h int64_native.h
 io.d.o: io.c config.h ../config/m.h ../config/s.h compatibility.h alloc.h \
-  misc.h mlvalues.h custom.h fail.h io.h memory.h gc.h major_gc.h \
-  freelist.h minor_gc.h signals.h sys.h
+ misc.h mlvalues.h custom.h fail.h io.h memory.h gc.h major_gc.h \
+ freelist.h minor_gc.h signals.h sys.h
 lexing.d.o: lexing.c fail.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h stacks.h memory.h gc.h major_gc.h freelist.h \
-  minor_gc.h
+ ../config/s.h mlvalues.h stacks.h memory.h gc.h major_gc.h freelist.h \
+ minor_gc.h
 main.d.o: main.c misc.h compatibility.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h sys.h
+ ../config/s.h mlvalues.h sys.h
 major_gc.d.o: major_gc.c compact.h config.h ../config/m.h ../config/s.h \
-  compatibility.h misc.h custom.h mlvalues.h fail.h finalise.h roots.h \
-  memory.h gc.h major_gc.h freelist.h minor_gc.h gc_ctrl.h weak.h
+ compatibility.h misc.h custom.h mlvalues.h fail.h finalise.h roots.h \
+ memory.h gc.h major_gc.h freelist.h minor_gc.h gc_ctrl.h weak.h
 md5.d.o: md5.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h md5.h io.h memory.h gc.h major_gc.h \
-  freelist.h minor_gc.h reverse.h
+ ../config/s.h mlvalues.h fail.h md5.h io.h memory.h gc.h major_gc.h \
+ freelist.h minor_gc.h reverse.h
 memory.d.o: memory.c fail.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h freelist.h gc.h gc_ctrl.h major_gc.h memory.h \
-  minor_gc.h signals.h
+ ../config/s.h mlvalues.h freelist.h gc.h gc_ctrl.h major_gc.h memory.h \
+ minor_gc.h signals.h
 meta.d.o: meta.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h fix_code.h interp.h intext.h io.h \
-  major_gc.h freelist.h memory.h gc.h minor_gc.h prims.h stacks.h
+ ../config/s.h mlvalues.h fail.h fix_code.h interp.h intext.h io.h \
+ major_gc.h freelist.h memory.h gc.h minor_gc.h prims.h stacks.h
 minor_gc.d.o: minor_gc.c config.h ../config/m.h ../config/s.h \
-  compatibility.h fail.h misc.h mlvalues.h finalise.h roots.h memory.h \
-  gc.h major_gc.h freelist.h minor_gc.h gc_ctrl.h signals.h weak.h
+ compatibility.h fail.h misc.h mlvalues.h finalise.h roots.h memory.h \
+ gc.h major_gc.h freelist.h minor_gc.h gc_ctrl.h signals.h weak.h
 misc.d.o: misc.c config.h ../config/m.h ../config/s.h compatibility.h \
-  misc.h memory.h gc.h mlvalues.h major_gc.h freelist.h minor_gc.h
+ misc.h memory.h gc.h mlvalues.h major_gc.h freelist.h minor_gc.h
 obj.d.o: obj.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h gc.h interp.h major_gc.h freelist.h \
-  memory.h minor_gc.h prims.h
+ ../config/s.h mlvalues.h fail.h gc.h interp.h major_gc.h freelist.h \
+ memory.h minor_gc.h prims.h
 parsing.d.o: parsing.c config.h ../config/m.h ../config/s.h compatibility.h \
-  mlvalues.h misc.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
-  alloc.h
+ mlvalues.h misc.h memory.h gc.h major_gc.h freelist.h minor_gc.h alloc.h
 prims.d.o: prims.c mlvalues.h compatibility.h config.h ../config/m.h \
-  ../config/s.h misc.h prims.h
+ ../config/s.h misc.h prims.h
 printexc.d.o: printexc.c backtrace.h mlvalues.h compatibility.h config.h \
-  ../config/m.h ../config/s.h misc.h callback.h debugger.h fail.h \
-  printexc.h
+ ../config/m.h ../config/s.h misc.h callback.h debugger.h fail.h \
+ printexc.h
 roots.d.o: roots.c finalise.h roots.h misc.h compatibility.h config.h \
-  ../config/m.h ../config/s.h memory.h gc.h mlvalues.h major_gc.h \
-  freelist.h minor_gc.h globroots.h stacks.h
-signals_byt.d.o: signals_byt.c config.h ../config/m.h ../config/s.h \
-  compatibility.h memory.h gc.h mlvalues.h misc.h major_gc.h freelist.h \
-  minor_gc.h osdeps.h signals.h signals_machdep.h
+ ../config/m.h ../config/s.h memory.h gc.h mlvalues.h major_gc.h \
+ freelist.h minor_gc.h globroots.h stacks.h
 signals.d.o: signals.c alloc.h compatibility.h misc.h config.h \
-  ../config/m.h ../config/s.h mlvalues.h callback.h fail.h memory.h gc.h \
-  major_gc.h freelist.h minor_gc.h roots.h signals.h signals_machdep.h \
-  sys.h
+ ../config/m.h ../config/s.h mlvalues.h callback.h fail.h memory.h gc.h \
+ major_gc.h freelist.h minor_gc.h roots.h signals.h signals_machdep.h \
+ sys.h
 signals_byt.d.o: signals_byt.c config.h ../config/m.h ../config/s.h \
-  compatibility.h memory.h gc.h mlvalues.h misc.h major_gc.h freelist.h \
-  minor_gc.h osdeps.h signals.h signals_machdep.h
+ compatibility.h memory.h gc.h mlvalues.h misc.h major_gc.h freelist.h \
+ minor_gc.h osdeps.h signals.h signals_machdep.h
 stacks.d.o: stacks.c config.h ../config/m.h ../config/s.h compatibility.h \
-  fail.h misc.h mlvalues.h stacks.h memory.h gc.h major_gc.h freelist.h \
-  minor_gc.h
+ fail.h misc.h mlvalues.h stacks.h memory.h gc.h major_gc.h freelist.h \
+ minor_gc.h
 startup.d.o: startup.c config.h ../config/m.h ../config/s.h compatibility.h \
-  alloc.h misc.h mlvalues.h backtrace.h callback.h custom.h debugger.h \
-  dynlink.h exec.h fail.h fix_code.h freelist.h gc_ctrl.h instrtrace.h \
-  interp.h intext.h io.h memory.h gc.h major_gc.h minor_gc.h osdeps.h \
-  prims.h printexc.h reverse.h signals.h stacks.h sys.h startup.h \
-  version.h
+ alloc.h misc.h mlvalues.h backtrace.h callback.h custom.h debugger.h \
+ dynlink.h exec.h fail.h fix_code.h freelist.h gc_ctrl.h instrtrace.h \
+ interp.h intext.h io.h memory.h gc.h major_gc.h minor_gc.h osdeps.h \
+ prims.h printexc.h reverse.h signals.h stacks.h sys.h startup.h \
+ version.h
 str.d.o: str.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h
+ ../config/s.h mlvalues.h fail.h
 sys.d.o: sys.c config.h ../config/m.h ../config/s.h compatibility.h alloc.h \
-  misc.h mlvalues.h debugger.h fail.h instruct.h osdeps.h signals.h \
-  stacks.h memory.h gc.h major_gc.h freelist.h minor_gc.h sys.h
+ misc.h mlvalues.h debugger.h fail.h instruct.h osdeps.h signals.h \
+ stacks.h memory.h gc.h major_gc.h freelist.h minor_gc.h sys.h
 terminfo.d.o: terminfo.c config.h ../config/m.h ../config/s.h \
-  compatibility.h alloc.h misc.h mlvalues.h fail.h io.h
+ compatibility.h alloc.h misc.h mlvalues.h fail.h io.h
 unix.d.o: unix.c config.h ../config/m.h ../config/s.h compatibility.h \
-  memory.h gc.h mlvalues.h misc.h major_gc.h freelist.h minor_gc.h \
-  osdeps.h
+ memory.h gc.h mlvalues.h misc.h major_gc.h freelist.h minor_gc.h \
+ osdeps.h
 weak.d.o: weak.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h major_gc.h freelist.h memory.h gc.h \
-  minor_gc.h
+ ../config/s.h mlvalues.h fail.h major_gc.h freelist.h memory.h gc.h \
+ minor_gc.h
 alloc.pic.o: alloc.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h custom.h major_gc.h freelist.h memory.h gc.h \
-  minor_gc.h stacks.h
+ ../config/s.h mlvalues.h custom.h major_gc.h freelist.h memory.h gc.h \
+ minor_gc.h stacks.h
 array.pic.o: array.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h memory.h gc.h major_gc.h freelist.h \
-  minor_gc.h
+ ../config/s.h mlvalues.h fail.h memory.h gc.h major_gc.h freelist.h \
+ minor_gc.h
 backtrace.pic.o: backtrace.c config.h ../config/m.h ../config/s.h \
-  compatibility.h mlvalues.h misc.h alloc.h io.h instruct.h intext.h \
-  fix_code.h exec.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
-  startup.h stacks.h sys.h backtrace.h
+ compatibility.h mlvalues.h misc.h alloc.h io.h instruct.h intext.h \
+ fix_code.h exec.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
+ startup.h stacks.h sys.h backtrace.h
 callback.pic.o: callback.c callback.h compatibility.h mlvalues.h config.h \
-  ../config/m.h ../config/s.h misc.h fail.h memory.h gc.h major_gc.h \
-  freelist.h minor_gc.h interp.h instruct.h fix_code.h stacks.h
+ ../config/m.h ../config/s.h misc.h fail.h memory.h gc.h major_gc.h \
+ freelist.h minor_gc.h interp.h instruct.h fix_code.h stacks.h
 compact.pic.o: compact.c config.h ../config/m.h ../config/s.h compatibility.h \
-  finalise.h roots.h misc.h memory.h gc.h mlvalues.h major_gc.h \
-  freelist.h minor_gc.h gc_ctrl.h weak.h
+ finalise.h roots.h misc.h memory.h gc.h mlvalues.h major_gc.h freelist.h \
+ minor_gc.h gc_ctrl.h weak.h
 compare.pic.o: compare.c custom.h compatibility.h mlvalues.h config.h \
-  ../config/m.h ../config/s.h misc.h fail.h memory.h gc.h major_gc.h \
-  freelist.h minor_gc.h
+ ../config/m.h ../config/s.h misc.h fail.h memory.h gc.h major_gc.h \
+ freelist.h minor_gc.h
 custom.pic.o: custom.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h custom.h fail.h memory.h gc.h major_gc.h \
-  freelist.h minor_gc.h
+ ../config/s.h mlvalues.h custom.h fail.h memory.h gc.h major_gc.h \
+ freelist.h minor_gc.h
 debugger.pic.o: debugger.c config.h ../config/m.h ../config/s.h \
-  compatibility.h debugger.h misc.h mlvalues.h fail.h fix_code.h \
-  instruct.h intext.h io.h stacks.h memory.h gc.h major_gc.h freelist.h \
-  minor_gc.h sys.h
+ compatibility.h debugger.h misc.h mlvalues.h fail.h fix_code.h \
+ instruct.h intext.h io.h stacks.h memory.h gc.h major_gc.h freelist.h \
+ minor_gc.h sys.h
 dynlink.pic.o: dynlink.c config.h ../config/m.h ../config/s.h compatibility.h \
-  alloc.h misc.h mlvalues.h dynlink.h fail.h memory.h gc.h major_gc.h \
-  freelist.h minor_gc.h osdeps.h prims.h
+ alloc.h misc.h mlvalues.h dynlink.h fail.h memory.h gc.h major_gc.h \
+ freelist.h minor_gc.h osdeps.h prims.h
 extern.pic.o: extern.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h custom.h fail.h gc.h intext.h io.h fix_code.h \
-  memory.h major_gc.h freelist.h minor_gc.h reverse.h
+ ../config/s.h mlvalues.h custom.h fail.h gc.h intext.h io.h fix_code.h \
+ memory.h major_gc.h freelist.h minor_gc.h reverse.h
 fail.pic.o: fail.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h io.h gc.h memory.h major_gc.h \
-  freelist.h minor_gc.h printexc.h signals.h stacks.h
+ ../config/s.h mlvalues.h fail.h io.h gc.h memory.h major_gc.h freelist.h \
+ minor_gc.h printexc.h signals.h stacks.h
 finalise.pic.o: finalise.c callback.h compatibility.h mlvalues.h config.h \
-  ../config/m.h ../config/s.h misc.h fail.h roots.h memory.h gc.h \
-  major_gc.h freelist.h minor_gc.h signals.h
+ ../config/m.h ../config/s.h misc.h fail.h roots.h memory.h gc.h \
+ major_gc.h freelist.h minor_gc.h signals.h
 fix_code.pic.o: fix_code.c config.h ../config/m.h ../config/s.h \
-  compatibility.h debugger.h misc.h mlvalues.h fix_code.h instruct.h \
-  md5.h io.h memory.h gc.h major_gc.h freelist.h minor_gc.h reverse.h
+ compatibility.h debugger.h misc.h mlvalues.h fix_code.h instruct.h md5.h \
+ io.h memory.h gc.h major_gc.h freelist.h minor_gc.h reverse.h
 floats.pic.o: floats.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h memory.h gc.h major_gc.h freelist.h \
-  minor_gc.h reverse.h stacks.h
+ ../config/s.h mlvalues.h fail.h memory.h gc.h major_gc.h freelist.h \
+ minor_gc.h reverse.h stacks.h
 freelist.pic.o: freelist.c config.h ../config/m.h ../config/s.h \
-  compatibility.h freelist.h misc.h mlvalues.h gc.h gc_ctrl.h memory.h \
-  major_gc.h minor_gc.h
+ compatibility.h freelist.h misc.h mlvalues.h gc.h gc_ctrl.h memory.h \
+ major_gc.h minor_gc.h
 gc_ctrl.pic.o: gc_ctrl.c alloc.h compatibility.h misc.h config.h \
-  ../config/m.h ../config/s.h mlvalues.h compact.h custom.h finalise.h \
-  roots.h memory.h gc.h major_gc.h freelist.h minor_gc.h gc_ctrl.h \
-  stacks.h
+ ../config/m.h ../config/s.h mlvalues.h compact.h custom.h finalise.h \
+ roots.h memory.h gc.h major_gc.h freelist.h minor_gc.h gc_ctrl.h \
+ stacks.h
 globroots.pic.o: globroots.c memory.h compatibility.h config.h ../config/m.h \
-  ../config/s.h gc.h mlvalues.h misc.h major_gc.h freelist.h minor_gc.h \
-  roots.h globroots.h
+ ../config/s.h gc.h mlvalues.h misc.h major_gc.h freelist.h minor_gc.h \
+ roots.h globroots.h
 hash.pic.o: hash.c mlvalues.h compatibility.h config.h ../config/m.h \
-  ../config/s.h misc.h custom.h memory.h gc.h major_gc.h freelist.h \
-  minor_gc.h
+ ../config/s.h misc.h custom.h memory.h gc.h major_gc.h freelist.h \
+ minor_gc.h
 instrtrace.pic.o: instrtrace.c
 intern.pic.o: intern.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h custom.h fail.h gc.h intext.h io.h fix_code.h \
-  memory.h major_gc.h freelist.h minor_gc.h reverse.h
+ ../config/s.h mlvalues.h custom.h fail.h gc.h intext.h io.h fix_code.h \
+ memory.h major_gc.h freelist.h minor_gc.h reverse.h
 interp.pic.o: interp.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h backtrace.h callback.h debugger.h fail.h \
-  fix_code.h instrtrace.h instruct.h interp.h major_gc.h freelist.h \
-  memory.h gc.h minor_gc.h prims.h signals.h stacks.h jumptbl.h
+ ../config/s.h mlvalues.h backtrace.h callback.h debugger.h fail.h \
+ fix_code.h instrtrace.h instruct.h interp.h major_gc.h freelist.h \
+ memory.h gc.h minor_gc.h prims.h signals.h stacks.h jumptbl.h
 ints.pic.o: ints.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h custom.h fail.h intext.h io.h fix_code.h \
-  memory.h gc.h major_gc.h freelist.h minor_gc.h int64_native.h
+ ../config/s.h mlvalues.h custom.h fail.h intext.h io.h fix_code.h \
+ memory.h gc.h major_gc.h freelist.h minor_gc.h int64_native.h
 io.pic.o: io.c config.h ../config/m.h ../config/s.h compatibility.h alloc.h \
-  misc.h mlvalues.h custom.h fail.h io.h memory.h gc.h major_gc.h \
-  freelist.h minor_gc.h signals.h sys.h
+ misc.h mlvalues.h custom.h fail.h io.h memory.h gc.h major_gc.h \
+ freelist.h minor_gc.h signals.h sys.h
 lexing.pic.o: lexing.c fail.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h stacks.h memory.h gc.h major_gc.h freelist.h \
-  minor_gc.h
+ ../config/s.h mlvalues.h stacks.h memory.h gc.h major_gc.h freelist.h \
+ minor_gc.h
 main.pic.o: main.c misc.h compatibility.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h sys.h
+ ../config/s.h mlvalues.h sys.h
 major_gc.pic.o: major_gc.c compact.h config.h ../config/m.h ../config/s.h \
-  compatibility.h misc.h custom.h mlvalues.h fail.h finalise.h roots.h \
-  memory.h gc.h major_gc.h freelist.h minor_gc.h gc_ctrl.h weak.h
+ compatibility.h misc.h custom.h mlvalues.h fail.h finalise.h roots.h \
+ memory.h gc.h major_gc.h freelist.h minor_gc.h gc_ctrl.h weak.h
 md5.pic.o: md5.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h md5.h io.h memory.h gc.h major_gc.h \
-  freelist.h minor_gc.h reverse.h
+ ../config/s.h mlvalues.h fail.h md5.h io.h memory.h gc.h major_gc.h \
+ freelist.h minor_gc.h reverse.h
 memory.pic.o: memory.c fail.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h freelist.h gc.h gc_ctrl.h major_gc.h memory.h \
-  minor_gc.h signals.h
+ ../config/s.h mlvalues.h freelist.h gc.h gc_ctrl.h major_gc.h memory.h \
+ minor_gc.h signals.h
 meta.pic.o: meta.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h fix_code.h interp.h intext.h io.h \
-  major_gc.h freelist.h memory.h gc.h minor_gc.h prims.h stacks.h
+ ../config/s.h mlvalues.h fail.h fix_code.h interp.h intext.h io.h \
+ major_gc.h freelist.h memory.h gc.h minor_gc.h prims.h stacks.h
 minor_gc.pic.o: minor_gc.c config.h ../config/m.h ../config/s.h \
-  compatibility.h fail.h misc.h mlvalues.h finalise.h roots.h memory.h \
-  gc.h major_gc.h freelist.h minor_gc.h gc_ctrl.h signals.h weak.h
+ compatibility.h fail.h misc.h mlvalues.h finalise.h roots.h memory.h \
+ gc.h major_gc.h freelist.h minor_gc.h gc_ctrl.h signals.h weak.h
 misc.pic.o: misc.c config.h ../config/m.h ../config/s.h compatibility.h \
-  misc.h memory.h gc.h mlvalues.h major_gc.h freelist.h minor_gc.h
+ misc.h memory.h gc.h mlvalues.h major_gc.h freelist.h minor_gc.h
 obj.pic.o: obj.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h gc.h interp.h major_gc.h freelist.h \
-  memory.h minor_gc.h prims.h
+ ../config/s.h mlvalues.h fail.h gc.h interp.h major_gc.h freelist.h \
+ memory.h minor_gc.h prims.h
 parsing.pic.o: parsing.c config.h ../config/m.h ../config/s.h compatibility.h \
-  mlvalues.h misc.h memory.h gc.h major_gc.h freelist.h minor_gc.h \
-  alloc.h
+ mlvalues.h misc.h memory.h gc.h major_gc.h freelist.h minor_gc.h alloc.h
 prims.pic.o: prims.c mlvalues.h compatibility.h config.h ../config/m.h \
-  ../config/s.h misc.h prims.h
+ ../config/s.h misc.h prims.h
 printexc.pic.o: printexc.c backtrace.h mlvalues.h compatibility.h config.h \
-  ../config/m.h ../config/s.h misc.h callback.h debugger.h fail.h \
-  printexc.h
+ ../config/m.h ../config/s.h misc.h callback.h debugger.h fail.h \
+ printexc.h
 roots.pic.o: roots.c finalise.h roots.h misc.h compatibility.h config.h \
-  ../config/m.h ../config/s.h memory.h gc.h mlvalues.h major_gc.h \
-  freelist.h minor_gc.h globroots.h stacks.h
+ ../config/m.h ../config/s.h memory.h gc.h mlvalues.h major_gc.h \
+ freelist.h minor_gc.h globroots.h stacks.h
 signals.pic.o: signals.c alloc.h compatibility.h misc.h config.h \
-  ../config/m.h ../config/s.h mlvalues.h callback.h fail.h memory.h gc.h \
-  major_gc.h freelist.h minor_gc.h roots.h signals.h signals_machdep.h \
-  sys.h
+ ../config/m.h ../config/s.h mlvalues.h callback.h fail.h memory.h gc.h \
+ major_gc.h freelist.h minor_gc.h roots.h signals.h signals_machdep.h \
+ sys.h
 signals_byt.pic.o: signals_byt.c config.h ../config/m.h ../config/s.h \
-  compatibility.h memory.h gc.h mlvalues.h misc.h major_gc.h freelist.h \
-  minor_gc.h osdeps.h signals.h signals_machdep.h
+ compatibility.h memory.h gc.h mlvalues.h misc.h major_gc.h freelist.h \
+ minor_gc.h osdeps.h signals.h signals_machdep.h
 stacks.pic.o: stacks.c config.h ../config/m.h ../config/s.h compatibility.h \
-  fail.h misc.h mlvalues.h stacks.h memory.h gc.h major_gc.h freelist.h \
-  minor_gc.h
+ fail.h misc.h mlvalues.h stacks.h memory.h gc.h major_gc.h freelist.h \
+ minor_gc.h
 startup.pic.o: startup.c config.h ../config/m.h ../config/s.h compatibility.h \
-  alloc.h misc.h mlvalues.h backtrace.h callback.h custom.h debugger.h \
-  dynlink.h exec.h fail.h fix_code.h freelist.h gc_ctrl.h instrtrace.h \
-  interp.h intext.h io.h memory.h gc.h major_gc.h minor_gc.h osdeps.h \
-  prims.h printexc.h reverse.h signals.h stacks.h sys.h startup.h \
-  version.h
+ alloc.h misc.h mlvalues.h backtrace.h callback.h custom.h debugger.h \
+ dynlink.h exec.h fail.h fix_code.h freelist.h gc_ctrl.h instrtrace.h \
+ interp.h intext.h io.h memory.h gc.h major_gc.h minor_gc.h osdeps.h \
+ prims.h printexc.h reverse.h signals.h stacks.h sys.h startup.h \
+ version.h
 str.pic.o: str.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h
+ ../config/s.h mlvalues.h fail.h
 sys.pic.o: sys.c config.h ../config/m.h ../config/s.h compatibility.h alloc.h \
-  misc.h mlvalues.h debugger.h fail.h instruct.h osdeps.h signals.h \
-  stacks.h memory.h gc.h major_gc.h freelist.h minor_gc.h sys.h
+ misc.h mlvalues.h debugger.h fail.h instruct.h osdeps.h signals.h \
+ stacks.h memory.h gc.h major_gc.h freelist.h minor_gc.h sys.h
 terminfo.pic.o: terminfo.c config.h ../config/m.h ../config/s.h \
-  compatibility.h alloc.h misc.h mlvalues.h fail.h io.h
+ compatibility.h alloc.h misc.h mlvalues.h fail.h io.h
 unix.pic.o: unix.c config.h ../config/m.h ../config/s.h compatibility.h \
-  memory.h gc.h mlvalues.h misc.h major_gc.h freelist.h minor_gc.h \
-  osdeps.h
+ memory.h gc.h mlvalues.h misc.h major_gc.h freelist.h minor_gc.h \
+ osdeps.h
 weak.pic.o: weak.c alloc.h compatibility.h misc.h config.h ../config/m.h \
-  ../config/s.h mlvalues.h fail.h major_gc.h freelist.h memory.h gc.h \
-  minor_gc.h
+ ../config/s.h mlvalues.h fail.h major_gc.h freelist.h memory.h gc.h \
+ minor_gc.h
diff -Nru jocaml-3.12.0/byterun/fail.c jocaml-3.12.1/byterun/fail.c
--- jocaml-3.12.0/byterun/fail.c	2008-10-14 07:37:28.000000000 +0000
+++ jocaml-3.12.1/byterun/fail.c	2011-07-07 14:32:00.000000000 +0000
@@ -11,10 +11,12 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: fail.c 9081 2008-10-14 07:37:28Z maranget $ */
+/* $Id: fail.c 11113 2011-07-07 14:32:00Z maranget $ */
 
 /* Raising exceptions from C. */
 
+#include <stdio.h>
+#include <stdlib.h>
 #include "alloc.h"
 #include "fail.h"
 #include "io.h"
@@ -85,13 +87,24 @@
   CAMLnoreturn;
 }
 
+/* PR#5115: Failure and Invalid_argument can be triggered by
+   input_value while reading the initial value of [caml_global_data]. */
+
 CAMLexport void caml_failwith (char const *msg)
 {
+  if (caml_global_data == 0) {
+    fprintf(stderr, "Fatal error: exception Failure(\"%s\")\n", msg);
+    exit(2);
+  }
   caml_raise_with_string(Field(caml_global_data, FAILURE_EXN), msg);
 }
 
 CAMLexport void caml_invalid_argument (char const *msg)
 {
+  if (caml_global_data == 0) {
+    fprintf(stderr, "Fatal error: exception Invalid_argument(\"%s\")\n", msg);
+    exit(2);
+  }
   caml_raise_with_string(Field(caml_global_data, INVALID_EXN), msg);
 }
 
diff -Nru jocaml-3.12.0/byterun/gc_ctrl.c jocaml-3.12.1/byterun/gc_ctrl.c
--- jocaml-3.12.0/byterun/gc_ctrl.c	2010-06-04 19:16:46.000000000 +0000
+++ jocaml-3.12.1/byterun/gc_ctrl.c	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: gc_ctrl.c 10505 2010-06-04 19:16:46Z maranget $ */
+/* $Id: gc_ctrl.c 11113 2011-07-07 14:32:00Z maranget $ */
 
 #include "alloc.h"
 #include "compact.h"
@@ -467,8 +467,11 @@
 
 CAMLprim value caml_gc_compaction(value v)
 {                                                    Assert (v == Val_unit);
+  caml_gc_message (0x10, "Heap compaction requested\n", 0);
   caml_empty_minor_heap ();
   caml_finish_major_cycle ();
+  caml_final_do_calls ();
+  caml_empty_minor_heap ();
   caml_finish_major_cycle ();
   caml_compact_heap ();
   caml_final_do_calls ();
@@ -481,7 +484,9 @@
 {
   uintnat major_heap_size = Bsize_wsize (norm_heapincr (major_size));
 
-  caml_page_table_initialize(Bsize_wsize(minor_size) + major_heap_size);
+  if (caml_page_table_initialize(Bsize_wsize(minor_size) + major_heap_size)){
+    caml_fatal_error ("OCaml runtime error: cannot initialize page table\n");
+  }
   caml_set_minor_heap_size (Bsize_wsize (norm_minsize (minor_size)));
   caml_major_heap_increment = Bsize_wsize (norm_heapincr (major_incr));
   caml_percent_free = norm_pfree (percent_fr);
diff -Nru jocaml-3.12.0/byterun/ints.c jocaml-3.12.1/byterun/ints.c
--- jocaml-3.12.0/byterun/ints.c	2010-06-04 19:16:46.000000000 +0000
+++ jocaml-3.12.1/byterun/ints.c	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: ints.c 10505 2010-06-04 19:16:46Z maranget $ */
+/* $Id: ints.c 11113 2011-07-07 14:32:00Z maranget $ */
 
 #include <stdio.h>
 #include <string.h>
@@ -614,7 +614,7 @@
 {
   intnat l = Nativeint_val(v);
 #ifdef ARCH_SIXTYFOUR
-  if (l <= 0x7FFFFFFFL && l >= -0x80000000L) {
+  if (l >= -((intnat)1 << 31) && l < ((intnat)1 << 31)) {
     caml_serialize_int_1(1);
     caml_serialize_int_4((int32) l);
   } else {
diff -Nru jocaml-3.12.0/byterun/major_gc.h jocaml-3.12.1/byterun/major_gc.h
--- jocaml-3.12.0/byterun/major_gc.h	2008-10-14 07:37:28.000000000 +0000
+++ jocaml-3.12.1/byterun/major_gc.h	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: major_gc.h 9081 2008-10-14 07:37:28Z maranget $ */
+/* $Id: major_gc.h 11113 2011-07-07 14:32:00Z maranget $ */
 
 #ifndef CAML_MAJOR_GC_H
 #define CAML_MAJOR_GC_H
@@ -54,7 +54,7 @@
 void caml_init_major_heap (asize_t);           /* size in bytes */
 asize_t caml_round_heap_chunk_size (asize_t);  /* size in bytes */
 void caml_darken (value, value *);
-intnat caml_major_collection_slice (long);
+intnat caml_major_collection_slice (intnat);
 void major_collection (void);
 void caml_finish_major_cycle (void);
 
diff -Nru jocaml-3.12.0/byterun/stacks.c jocaml-3.12.1/byterun/stacks.c
--- jocaml-3.12.0/byterun/stacks.c	2010-06-04 19:16:46.000000000 +0000
+++ jocaml-3.12.1/byterun/stacks.c	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: stacks.c 10505 2010-06-04 19:16:46Z maranget $ */
+/* $Id: stacks.c 11113 2011-07-07 14:32:00Z maranget $ */
 
 /* To initialize and resize the stacks */
 
@@ -28,7 +28,7 @@
 CAMLexport value * caml_extern_sp;
 CAMLexport value * caml_trapsp;
 CAMLexport value * caml_trap_barrier;
-value caml_global_data;
+value caml_global_data = 0;
 
 uintnat caml_max_stack_size;            /* also used in gc_ctrl.c */
 
diff -Nru jocaml-3.12.0/byterun/startup.c jocaml-3.12.1/byterun/startup.c
--- jocaml-3.12.0/byterun/startup.c	2010-06-04 19:16:46.000000000 +0000
+++ jocaml-3.12.1/byterun/startup.c	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: startup.c 10505 2010-06-04 19:16:46Z maranget $ */
+/* $Id: startup.c 11113 2011-07-07 14:32:00Z maranget $ */
 
 /* Start-up code */
 
@@ -288,7 +288,7 @@
 static void scanmult (char *opt, uintnat *var)
 {
   char mult = ' ';
-  int val;
+  unsigned int val;
   sscanf (opt, "=%u%c", &val, &mult);
   sscanf (opt, "=0x%x%c", &val, &mult);
   switch (mult) {
diff -Nru jocaml-3.12.0/byterun/sys.c jocaml-3.12.1/byterun/sys.c
--- jocaml-3.12.0/byterun/sys.c	2007-03-23 09:01:11.000000000 +0000
+++ jocaml-3.12.1/byterun/sys.c	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: sys.c 8113 2007-03-23 09:01:11Z maranget $ */
+/* $Id: sys.c 11113 2011-07-07 14:32:00Z maranget $ */
 
 /* Basic system calls */
 
@@ -138,12 +138,14 @@
   /* open on a named FIFO can block (PR#1533) */
   caml_enter_blocking_section();
   fd = open(p, flags, perm);
+  /* fcntl on a fd can block (PR#5069)*/
+#if defined(F_SETFD) && defined(FD_CLOEXEC)
+  if (fd != -1)
+    fcntl(fd, F_SETFD, FD_CLOEXEC);
+#endif
   caml_leave_blocking_section();
   caml_stat_free(p);
   if (fd == -1) caml_sys_error(path);
-#if defined(F_SETFD) && defined(FD_CLOEXEC)
-  fcntl(fd, F_SETFD, FD_CLOEXEC);
-#endif
   CAMLreturn(Val_long(fd));
 }
 
diff -Nru jocaml-3.12.0/Changes jocaml-3.12.1/Changes
--- jocaml-3.12.0/Changes	2010-07-26 09:02:43.000000000 +0000
+++ jocaml-3.12.1/Changes	2011-07-07 14:32:00.000000000 +0000
@@ -1,3 +1,100 @@
+Objective Caml 3.12.1:
+----------------------
+
+Bug fixes:
+- PR#4345, PR#4767: problems with camlp4 printing of float values
+- PR#4380: ocamlbuild should not use tput on windows
+- PR#4487, PR#5164: multiple 'module type of' are incompatible
+- PR#4552: ocamlbuild does not create symlinks when using '.itarget' file
+- PR#4673, PR#5144: camlp4 fails on object copy syntax
+- PR#4702: system threads: cleanup tick thread at exit
+- PR#4732: camlp4 rejects polymorphic variants using keywords from macros
+- PR#4778: Win32/MSVC port: rare syntax error in generated MASM assembly file
+- PR#4794, PR#4959: call annotations not generated by ocamlopt
+- PR#4820: revised syntax pretty printer crashes with 'Stack_overflow'
+- PR#4928: wrong printing of classes and class types by camlp4
+- PR#4939: camlp4 rejects patterns of the '?x:_' form
+- PR#4967: ocamlbuild passes wrong switches to ocamldep through menhir
+- PR#4972: mkcamlp4 does not include 'dynlink.cma'
+- PR#5039: ocamlbuild should use '-linkpkg' only when linking programs
+- PR#5066: ocamldoc: add -charset option used in html generator
+- PR#5069: fcntl() in caml_sys_open may block, do it within blocking section
+- PR#5071, PR#5129, PR#5134: inconsistencies between camlp4 and camlp4* binaries
+- PR#5080, PR#5104: regression in type constructor handling by camlp4
+- PR#5090: bad interaction between toplevel and camlp4
+- PR#5095: ocamlbuild ignores some tags when building bytecode objects
+- PR#5100: ocamlbuild always rebuilds a 'cmxs' file
+- PR#5103: build and install objinfo when building with ocamlbuild
+- PR#5109: crash when a parser calls a lexer that calls another parser
+- PR#5110: invalid module name when using optional argument
+- PR#5115: bytecode executables produced by msvc64 port crash on 32-bit versions
+- PR#5117: bigarray: wrong function name without HAS_MMAP; missing include
+- PR#5118: Camlp4o and integer literals
+- PR#5122: camlp4 rejects lowercase identifiers for module types
+- PR#5123: shift_right_big_int returns a wrong zero
+- PR#5124: substitution inside a signature leads to odd printing
+- PR#5128: typo in 'Camlp4ListComprehension' syntax extension
+- PR#5136: obsolete function used in emacs mode
+- PR#5145: ocamldoc: missing html escapes
+- PR#5146: problem with spaces in multi-line string constants
+- PR#5149: (partial) various documentation problems
+- PR#5156: rare compiler crash with objects
+- PR#5165: ocamlbuild does not pass '-thread' option to ocamlfind
+- PR#5167: camlp4r loops when printing package type
+- PR#5172: camlp4 support for 'module type of' construct
+- PR#5175: in bigarray accesses, make sure bigarray expr is evaluated only once
+- PR#5177: Gc.compact implies Gc.full_major
+- PR#5182: use bytecode version of ocamldoc to generate man pages
+- PR#5184: under Windows, alignment issue with bigarrays mapped from files
+- PR#5188: double-free corruption in bytecode system threads
+- PR#5192: mismatch between words and bytes in interpreting max_young_wosize
+- PR#5202: error in documentation of atan2
+- PR#5209: natdynlink incorrectly detected on BSD systems
+- PR#5213: ocamlbuild should pass '-rectypes' to ocamldoc when needed
+- PR#5217: ocamlfind plugin should add '-linkpkg' for toplevel
+- PR#5228: document the exceptions raised by functions in 'Filename'
+- PR#5229: typo in build script ('TAG_LINE' vs 'TAGLINE')
+- PR#5230: error in documentation of Scanf.Scanning.open_in
+- PR#5234: option -shared reverses order of -cclib options
+- PR#5237: incorrect .size directives generated for x86-32 and x86-64
+- PR#5244: String.compare uses polymorphic compare_val (regression of PR#4194)
+- PR#5248: regression introduced while fixing PR#5118
+- PR#5252: typo in docs
+- PR#5258: win32unix: unix fd leak under windows
+- PR#5269: (tentative fix) Wrong ext_ref entries in .annot files
+- PR#5272: caml.el doesn't recognize downto as a keyword
+- PR#5276: issue with ocamlc -pack and recursively-packed modules
+- PR#5280: alignment constraints incorrectly autodetected on MIPS 32
+- PR#5281: typo in error message
+- PR#5308: unused variables not detected in "include (struct .. end)"
+- camlp4 revised syntax printing bug in the toplevel (reported on caml-list)
+- configure: do not define _WIN32 under cygwin
+- Hardened generic comparison in the case where two custom blocks
+  are compared and have different sets of custom operations.
+- Hardened comparison between bigarrays in the case where the two
+  bigarrays have different kinds.
+- Fixed wrong autodetection of expm1() and log1p().
+- don't add .exe suffix when installing the ocamlmktop shell script
+- ocamldoc: minor fixes related to the display of ocamldoc options
+- fixed bug with huge values in OCAMLRUNPARAM
+- mismatch between declaration and definition of caml_major_collection_slice
+
+Feature wishes:
+- PR#4992: added '-ml-synonym' and '-mli-synonym' options to ocamldep
+- PR#5065: added '-ocamldoc' option to ocamlbuild
+- PR#5139: added possibility to add options to ocamlbuild
+- PR#5158: added access to current camlp4 parsers and printers
+- PR#5180: improved instruction selection for float operations on amd64
+- stdlib: added a 'usage_string' function to Arg
+- allow with constraints to add a type equation to a datatype definition
+- ocamldoc: allow to merge '@before' tags like other ones
+- ocamlbuild: allow dependency on file "_oasis"
+
+Other changes:
+- Changed default minor heap size from 32k to 256k words.
+- Added new operation 'compare_ext' to custom blocks, called when
+  comparing a custom block value with an unboxed integer.
+
 Objective Caml 3.12.0:
 ----------------------
 
@@ -2623,4 +2720,4 @@
 
 * First public release.
 
-$Id: Changes 10634 2010-07-26 09:02:43Z maranget $
+$Id: Changes 11113 2011-07-07 14:32:00Z maranget $
diff -Nru jocaml-3.12.0/Changes_JoCaml jocaml-3.12.1/Changes_JoCaml
--- jocaml-3.12.0/Changes_JoCaml	2010-09-06 13:32:53.000000000 +0000
+++ jocaml-3.12.1/Changes_JoCaml	2011-07-07 14:32:00.000000000 +0000
@@ -1,5 +1,10 @@
-JoCaml 3.12.0
+JoCaml 3.12.1
+-------------
+- Follow ocaml release.
+- JoinPool bug: nagain was decremented twice!
 
+JoCaml 3.12.0
+-------------
 - Corrected bug in typing : arguments of join-patterns must
   get unified, channel per channel, before compiling algebraic
   patterns in join-patterns. Reason: the compilation assumes
@@ -44,4 +49,4 @@
 --------------
 Initial release
 
-$Id: Changes_JoCaml 10670 2010-09-06 13:32:53Z maranget $
\ No newline at end of file
+$Id: Changes_JoCaml 11113 2011-07-07 14:32:00Z maranget $
\ No newline at end of file
diff -Nru jocaml-3.12.0/config/auto-aux/expm1.c jocaml-3.12.1/config/auto-aux/expm1.c
--- jocaml-3.12.0/config/auto-aux/expm1.c	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/config/auto-aux/expm1.c	2011-07-07 14:32:00.000000000 +0000
@@ -0,0 +1,26 @@
+/***********************************************************************/
+/*                                                                     */
+/*                           Objective Caml                            */
+/*                                                                     */
+/*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         */
+/*                                                                     */
+/*  Copyright 2011 Institut National de Recherche en Informatique et   */
+/*  en Automatique.  All rights reserved.  This file is distributed    */
+/*  under the terms of the GNU Library General Public License, with    */
+/*  the special exception on linking described in file ../../LICENSE.  */
+/*                                                                     */
+/***********************************************************************/
+
+/* $Id: longlong.c 4833 2002-05-25 08:33:26Z xleroy $ */
+
+#include <math.h>
+
+volatile double x;
+
+int main(int argc, char **argv)
+{
+  x = 3.1415;
+  x = expm1(x);
+  x = log1p(x);
+  return 0;
+}
diff -Nru jocaml-3.12.0/configure jocaml-3.12.1/configure
--- jocaml-3.12.0/configure	2010-09-06 13:32:53.000000000 +0000
+++ jocaml-3.12.1/configure	2011-07-07 14:32:00.000000000 +0000
@@ -13,7 +13,7 @@
 #                                                                       #
 #########################################################################
 
-# $Id: configure 10670 2010-09-06 13:32:53Z maranget $
+# $Id: configure 11113 2011-07-07 14:32:00Z maranget $
 topdir=`pwd`
 configure_options="$*"
 prefix=/usr/local
@@ -336,7 +336,7 @@
     bytecccompopts="-D_XOPEN_SOURCE=500";;
   gcc*,*-*-cygwin*)
     bytecccompopts="-fno-defer-pop $gcc_warnings -U_WIN32"
-    dllccompopts="-D_WIN32 -DCAML_DLL"
+    dllccompopts="-U_WIN32 -DCAML_DLL"
     if test $withsharedlibs = yes; then
       flexlink="flexlink -chain cygwin -merge-manifest"
       flexdir=`$flexlink -where | dos2unix`
@@ -465,11 +465,12 @@
 # Determine alignment constraints
 
 case "$host" in
-  sparc*-*-*|hppa*-*-*|arm*-*-*)
+  sparc*-*-*|hppa*-*-*|arm*-*-*|mips*-*-*)
     # On Sparc V9 with certain versions of gcc, determination of double
     # alignment is not reliable (PR#1521), hence force it.
     # Same goes for hppa.
     # PR#5088 suggests same problem on ARM.
+    # PR#5280 reports same problem on MIPS.
     # But there's a knack (PR#2572):
     # if we're in 64-bit mode (sizeof(long) == 8),
     # we must not doubleword-align floats...
@@ -497,8 +498,8 @@
 
 if $int64_native; then
   case "$host" in
-    # PR#5088: autodetection is unreliable on ARM
-    sparc*-*-*|hppa*-*-*|arm*-*-*)
+    # PR#5088: autodetection is unreliable on ARM.  PR#5280: also on MIPS.
+    sparc*-*-*|hppa*-*-*|arm*-*-*|mips*-*-*)
       if test $2 = 8; then
         echo "64-bit integers can be word-aligned."
         echo "#undef ARCH_ALIGN_INT64" >> m.h
@@ -660,6 +661,12 @@
     sparc-*-linux*)               natdynlink=true;;
     i686-*-kfreebsd*)             natdynlink=true;;
     x86_64-*-kfreebsd*)           natdynlink=true;;
+    i[345]86-*-freebsd*)          natdynlink=true;;
+    x86_64-*-freebsd*)            natdynlink=true;;
+    i[345]86-*-openbsd*)          natdynlink=true;;
+    x86_64-*-openbsd*)            natdynlink=true;;
+    i[345]86-*-netbsd*)           natdynlink=true;;
+    x86_64-*-netbsd*)             natdynlink=true;;
     i386-*-gnu0.3)                natdynlink=true;;
   esac
 fi
@@ -1564,6 +1571,10 @@
   fi
 fi
 
+case "$host" in
+  *-*-cygwin*) tk_libs="$tk_libs -lws2_32";;
+esac
+
 if test $has_tk = true; then
   if sh ./hasgot $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then
     echo "Tcl/Tk libraries found."
diff -Nru jocaml-3.12.0/debian/changelog jocaml-3.12.1/debian/changelog
--- jocaml-3.12.0/debian/changelog	2011-12-01 13:02:23.000000000 +0000
+++ jocaml-3.12.1/debian/changelog	2011-12-01 13:02:24.000000000 +0000
@@ -1,3 +1,29 @@
+jocaml (3.12.1-1ubuntu1) precise; urgency=low
+
+  * Resynchronise with Debian.  Remaining changes:
+    - Snag the 0001-Pass-no-relax-to-ld-on-alpha.patch from ocaml to match
+      ocaml's linker behaviour with regard to --hash-style=both
+      --no-copy-dt-needed-entries --as-needed switches.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 01 Dec 2011 12:51:04 +0000
+
+jocaml (3.12.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Refresh patches
+    - Remove patches integrated into this latest release:
+      + 0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
+    - New patches (from OCaml package):
+      + 0004-ocamlopt-arm-add-.type-directive-for-code-symbols.patch
+      + 0005-Add-support-for-ENOTSUP.patch
+      + 0006-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch
+    - Replace 0003-Natdynlink-works-on-powerpc.patch with a more complete
+      patch 0003-Natdynlink-works-on-powerpc-and-hurd-i386.patch
+  * Bump least version needed for OCaml in Build-Depends
+  * Bump Standards-Version to 3.9.2, no changes required.
+
+ -- Mehdi Dogguy <mehdi@debian.org>  Tue, 01 Nov 2011 22:52:10 +0100
+
 jocaml (3.12.0-1ubuntu3) precise; urgency=low
 
   * Rebuild for OCaml 3.12.1.
diff -Nru jocaml-3.12.0/debian/control jocaml-3.12.1/debian/control
--- jocaml-3.12.0/debian/control	2011-12-01 13:02:23.000000000 +0000
+++ jocaml-3.12.1/debian/control	2011-12-01 13:02:24.000000000 +0000
@@ -14,9 +14,9 @@
  libncurses5-dev,
  libgdbm-dev,
  dh-ocaml (>= 1.0~),
- ocaml-nox (>= 3.12~)
+ ocaml-nox (>= 3.12.1~)
 Homepage: http://jocaml.inria.fr/
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/jocaml.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/jocaml.git
 
diff -Nru jocaml-3.12.0/debian/patches/0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch jocaml-3.12.1/debian/patches/0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch
--- jocaml-3.12.0/debian/patches/0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch	2011-12-01 13:02:23.000000000 +0000
+++ jocaml-3.12.1/debian/patches/0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch	2011-12-01 13:02:24.000000000 +0000
@@ -9,7 +9,7 @@
  3 files changed, 1 insertions(+), 3 deletions(-)
 
 diff --git a/typing/oprint.ml b/typing/oprint.ml
-index 45bca05..2a36e7a 100644
+index cd4cfa5..4ad2e3e 100644
 --- a/typing/oprint.ml
 +++ b/typing/oprint.ml
 @@ -213,7 +213,6 @@ and print_simple_out_type ppf =
@@ -33,7 +33,7 @@
  and out_variant =
    | Ovar_fields of (string * bool * out_type list) list
 diff --git a/typing/printtyp.ml b/typing/printtyp.ml
-index fc6311f..1006b92 100644
+index 6178561..acccb3a 100644
 --- a/typing/printtyp.ml
 +++ b/typing/printtyp.ml
 @@ -399,7 +399,7 @@ let rec tree_of_typexp sch ty =
diff -Nru jocaml-3.12.0/debian/patches/0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch jocaml-3.12.1/debian/patches/0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
--- jocaml-3.12.0/debian/patches/0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch	2011-12-01 13:02:23.000000000 +0000
+++ jocaml-3.12.1/debian/patches/0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-From: Stephane Glondu <steph@glondu.net>
-Date: Tue, 8 Mar 2011 21:17:40 +0100
-Subject: [PATCH] Fix ocamlopt w.r.t. binutils 2.21
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Bug: http://caml.inria.fr/mantis/view.php?id=5237
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617404
-Authors: Eric Cooper, spiralvoice
-Reviewed-by: Stéphane Glondu <steph@glondu.net>
----
- asmcomp/amd64/emit.mlp |   13 +++++++------
- asmcomp/i386/emit.mlp  |    6 +++---
- 2 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/asmcomp/amd64/emit.mlp b/asmcomp/amd64/emit.mlp
-index 0a210f0..5022fe9 100644
---- a/asmcomp/amd64/emit.mlp
-+++ b/asmcomp/amd64/emit.mlp
-@@ -688,17 +688,18 @@ let fundecl fundecl =
-   emit_all true fundecl.fun_body;
-   List.iter emit_call_gc !call_gc_sites;
-   emit_call_bound_errors ();
-+  begin match Config.system with
-+    "linux" | "gnu" ->
-+      `	.type	{emit_symbol fundecl.fun_name},@function\n`;
-+      `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
-+    | _ -> ()
-+  end;
-   if !float_constants <> [] then begin
-     if macosx
-     then `	.literal8\n`
-     else `	.section	.rodata.cst8,\"a\",@progbits\n`;
-     List.iter emit_float_constant !float_constants
--  end;
--  match Config.system with
--    "linux" | "gnu" ->
--      `	.type	{emit_symbol fundecl.fun_name},@function\n`;
--      `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
--  | _ -> ()
-+  end
- 
- (* Emission of data *)
- 
-diff --git a/asmcomp/i386/emit.mlp b/asmcomp/i386/emit.mlp
-index 16ee67e..cf162c5 100644
---- a/asmcomp/i386/emit.mlp
-+++ b/asmcomp/i386/emit.mlp
-@@ -905,12 +905,12 @@ let fundecl fundecl =
-   emit_all true fundecl.fun_body;
-   List.iter emit_call_gc !call_gc_sites;
-   emit_call_bound_errors ();
--  List.iter emit_float_constant !float_constants;
--  match Config.system with
-+  begin match Config.system with
-     "linux_elf" | "bsd_elf" | "gnu" ->
-       `	.type	{emit_symbol fundecl.fun_name},@function\n`;
-       `	.size	{emit_symbol fundecl.fun_name},.-{emit_symbol fundecl.fun_name}\n`
--  | _ -> ()
-+  | _ -> () end;
-+  List.iter emit_float_constant !float_constants
- 
- 
- (* Emission of data *)
--- 
diff -Nru jocaml-3.12.0/debian/patches/0003-Natdynlink-works-on-powerpc-and-hurd-i386.patch jocaml-3.12.1/debian/patches/0003-Natdynlink-works-on-powerpc-and-hurd-i386.patch
--- jocaml-3.12.0/debian/patches/0003-Natdynlink-works-on-powerpc-and-hurd-i386.patch	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/debian/patches/0003-Natdynlink-works-on-powerpc-and-hurd-i386.patch	2011-12-01 13:02:24.000000000 +0000
@@ -0,0 +1,36 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Sat, 16 Apr 2011 23:41:23 +0200
+Subject: [PATCH] Natdynlink works on powerpc and hurd-i386
+
+Rationale: ssreflect used to work with natdynlink on powerpc and hurd
+with ocaml 3.11.2 / coq 8.2...
+
+Note: there is no native compiler for powerpc64! This must be a
+typo...
+
+Signed-off-by: Stephane Glondu <steph@glondu.net>
+---
+ configure |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index 1cdf960..eb32dc0 100755
+--- a/configure
++++ b/configure
+@@ -651,13 +651,14 @@ if test $withsharedlibs = "yes"; then
+   case "$host" in
+     *-*-cygwin*)                  natdynlink=true;;
+     i[3456]86-*-linux*)           natdynlink=true;;
++    i[3456]86-*-gnu*)             natdynlink=true;;
+     x86_64-*-linux*)              natdynlink=true;;
+     i[3456]86-*-darwin10.*)
+       if test $arch64 == true; then
+         natdynlink=true
+       fi;;
+     i[3456]86-*-darwin[89]*)      natdynlink=true;;
+-    powerpc64-*-linux*)           natdynlink=true;;
++    powerpc-*-linux*)             natdynlink=true;;
+     sparc-*-linux*)               natdynlink=true;;
+     i686-*-kfreebsd*)             natdynlink=true;;
+     x86_64-*-kfreebsd*)           natdynlink=true;;
+-- 
diff -Nru jocaml-3.12.0/debian/patches/0004-Natdynlink-works-on-powerpc.patch jocaml-3.12.1/debian/patches/0004-Natdynlink-works-on-powerpc.patch
--- jocaml-3.12.0/debian/patches/0004-Natdynlink-works-on-powerpc.patch	2011-12-01 13:02:23.000000000 +0000
+++ jocaml-3.12.1/debian/patches/0004-Natdynlink-works-on-powerpc.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-From: Stephane Glondu <steph@glondu.net>
-Date: Sat, 16 Apr 2011 23:41:23 +0200
-Subject: [PATCH] Natdynlink works on powerpc
-
-Rationale: ssreflect used to work with natdynlink on powerpc with
-ocaml 3.11.2 / coq 8.2... and there is no native compiler for
-powerpc64! This must be a typo...
-
-Signed-off-by: Stephane Glondu <steph@glondu.net>
----
- configure |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index 3f99f6f..00b0cb9 100755
---- a/configure
-+++ b/configure
-@@ -656,7 +656,7 @@ if test $withsharedlibs = "yes"; then
-         natdynlink=true
-       fi;;
-     i[3456]86-*-darwin[89]*)      natdynlink=true;;
--    powerpc64-*-linux*)           natdynlink=true;;
-+    powerpc-*-linux*)           natdynlink=true;;
-     sparc-*-linux*)               natdynlink=true;;
-     i686-*-kfreebsd*)             natdynlink=true;;
-     x86_64-*-kfreebsd*)           natdynlink=true;;
--- 
diff -Nru jocaml-3.12.0/debian/patches/0004-ocamlopt-arm-add-.type-directive-for-code-symbols.patch jocaml-3.12.1/debian/patches/0004-ocamlopt-arm-add-.type-directive-for-code-symbols.patch
--- jocaml-3.12.0/debian/patches/0004-ocamlopt-arm-add-.type-directive-for-code-symbols.patch	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/debian/patches/0004-ocamlopt-arm-add-.type-directive-for-code-symbols.patch	2011-12-01 13:02:24.000000000 +0000
@@ -0,0 +1,125 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Fri, 12 Aug 2011 21:13:17 +0200
+Subject: [PATCH] ocamlopt/arm: add .type directive for code symbols
+
+Bug: http://caml.inria.fr/mantis/view.php?id=5336
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/810402
+Signed-off-by: Stephane Glondu <steph@glondu.net>
+---
+ asmcomp/arm/emit.mlp |    1 +
+ asmrun/arm.S         |   12 ++++++++++++
+ 2 files changed, 13 insertions(+), 0 deletions(-)
+
+diff --git a/asmcomp/arm/emit.mlp b/asmcomp/arm/emit.mlp
+index 256ffae..672a9b0 100644
+--- a/asmcomp/arm/emit.mlp
++++ b/asmcomp/arm/emit.mlp
+@@ -556,6 +556,7 @@ let fundecl fundecl =
+   `	.text\n`;
+   `	.align	2\n`;
+   `	.global	{emit_symbol fundecl.fun_name}\n`;
++  `	.type	{emit_symbol fundecl.fun_name}, %function\n`;
+   `{emit_symbol fundecl.fun_name}:\n`;
+   let n = frame_size() in
+   ignore(emit_stack_adjustment "sub" n);
+diff --git a/asmrun/arm.S b/asmrun/arm.S
+index 50314f1..4e493cf 100644
+--- a/asmrun/arm.S
++++ b/asmrun/arm.S
+@@ -24,6 +24,7 @@ alloc_limit     .req    r10
+ /* Allocation functions and GC interface */
+ 
+         .globl caml_call_gc
++        .type caml_call_gc, %function
+ caml_call_gc:
+     /* Record return address and desired size */
+     /* Can use alloc_limit as a temporary since it will be reloaded by
+@@ -41,6 +42,7 @@ caml_call_gc:
+         bx      lr
+ 
+         .globl caml_alloc1
++        .type caml_alloc1, %function
+ caml_alloc1:
+         sub     alloc_ptr, alloc_ptr, #8
+         cmp     alloc_ptr, alloc_limit
+@@ -54,6 +56,7 @@ caml_alloc1:
+         b       caml_alloc1
+ 
+         .globl caml_alloc2
++        .type caml_alloc2, %function
+ caml_alloc2:
+         sub     alloc_ptr, alloc_ptr, #12
+         cmp     alloc_ptr, alloc_limit
+@@ -67,6 +70,7 @@ caml_alloc2:
+         b       caml_alloc2
+ 
+         .globl caml_alloc3
++        .type caml_alloc3, %function
+ caml_alloc3:
+         sub     alloc_ptr, alloc_ptr, #16
+         cmp     alloc_ptr, alloc_limit
+@@ -80,6 +84,7 @@ caml_alloc3:
+         b       caml_alloc3
+ 
+         .globl caml_allocN
++        .type caml_allocN, %function
+ caml_allocN:
+         sub     alloc_ptr, alloc_ptr, r12
+         cmp     alloc_ptr, alloc_limit
+@@ -134,6 +139,7 @@ caml_allocN:
+ /* Function to call is in r12 */
+ 
+         .globl caml_c_call
++        .type caml_c_call, %function
+ caml_c_call:
+     /* Preserve return address in callee-save register r4 */
+         mov     r4, lr
+@@ -160,6 +166,7 @@ caml_c_call:
+ /* Start the Caml program */
+ 
+         .globl caml_start_program
++        .type caml_start_program, %function
+ caml_start_program:
+         ldr     r12, .Lcaml_program
+ 
+@@ -235,6 +242,7 @@ caml_start_program:
+ /* Raise an exception from C */
+ 
+         .globl caml_raise_exception
++        .type caml_raise_exception, %function
+ caml_raise_exception:
+     /* Reload Caml allocation pointers */
+         ldr     r12, .Lcaml_young_ptr
+@@ -250,6 +258,7 @@ caml_raise_exception:
+ /* Callback from C to Caml */
+ 
+         .globl caml_callback_exn
++        .type caml_callback_exn, %function
+ caml_callback_exn:
+     /* Initial shuffling of arguments (r0 = closure, r1 = first arg) */
+         mov     r12, r0
+@@ -259,6 +268,7 @@ caml_callback_exn:
+         b       .Ljump_to_caml
+ 
+         .globl caml_callback2_exn
++        .type caml_callback2_exn, %function
+ caml_callback2_exn:
+     /* Initial shuffling of arguments (r0 = closure, r1 = arg1, r2 = arg2) */
+         mov     r12, r0
+@@ -269,6 +279,7 @@ caml_callback2_exn:
+         b       .Ljump_to_caml
+ 
+         .globl caml_callback3_exn
++        .type caml_callback3_exn, %function
+ caml_callback3_exn:
+     /* Initial shuffling of arguments */
+     /* (r0 = closure, r1 = arg1, r2 = arg2, r3 = arg3) */
+@@ -281,6 +292,7 @@ caml_callback3_exn:
+         b       .Ljump_to_caml
+ 
+         .globl caml_ml_array_bound_error
++        .type caml_ml_array_bound_error, %function
+ caml_ml_array_bound_error:
+     /* Load address of [caml_array_bound_error] in r12 */
+         ldr     r12, .Lcaml_array_bound_error
+-- 
diff -Nru jocaml-3.12.0/debian/patches/0005-Add-support-for-ENOTSUP.patch jocaml-3.12.1/debian/patches/0005-Add-support-for-ENOTSUP.patch
--- jocaml-3.12.0/debian/patches/0005-Add-support-for-ENOTSUP.patch	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/debian/patches/0005-Add-support-for-ENOTSUP.patch	2011-12-01 13:02:24.000000000 +0000
@@ -0,0 +1,49 @@
+From: Samuel Thibault <sthibault@debian.org>
+Date: Tue, 1 Nov 2011 13:48:38 +0100
+Subject: [PATCH] Add support for ENOTSUP
+
+On some systems such as Solaris or GNU/Hurd, ENOTSUP and EOPNOSUPP do
+not have the same value, but ocaml code only deals with EOPNOSUPP, and
+thus ocaml applications only handle the EOPNOSUPP case. The attached
+patch fixes it by making ocaml convert ENOTSUP errors into EOPNOSUPP
+errors.
+
+This patch fixes omake build on hurd-i386.
+
+Bug: http://caml.inria.fr/mantis/view.php?id=5382
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=646372
+Signed-off-by: Stephane Glondu <steph@glondu.net>
+---
+ otherlibs/unix/unixsupport.c |   11 ++++++++++-
+ 1 files changed, 10 insertions(+), 1 deletions(-)
+
+diff --git a/otherlibs/unix/unixsupport.c b/otherlibs/unix/unixsupport.c
+index adfd6e8..ab22aa1 100644
+--- a/otherlibs/unix/unixsupport.c
++++ b/otherlibs/unix/unixsupport.c
+@@ -165,7 +165,11 @@
+ #define ESOCKTNOSUPPORT (-1)
+ #endif
+ #ifndef EOPNOTSUPP
+-#define EOPNOTSUPP (-1)
++#  ifdef ENOTSUP
++#    define EOPNOTSUPP ENOTSUP
++#  else
++#    define EOPNOTSUPP (-1)
++#  endif
+ #endif
+ #ifndef EPFNOSUPPORT
+ #define EPFNOSUPPORT (-1)
+@@ -252,6 +256,11 @@ value unix_error_of_code (int errcode)
+   int errconstr;
+   value err;
+ 
++#if defined(ENOTSUP) && (EOPNOTSUPP != ENOTSUP)
++  if (errcode == ENOTSUP)
++    errcode = EOPNOTSUPP;
++#endif
++
+   errconstr =
+       cst_to_constr(errcode, error_table, sizeof(error_table)/sizeof(int), -1);
+   if (errconstr == Val_int(-1)) {
+-- 
diff -Nru jocaml-3.12.0/debian/patches/0006-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch jocaml-3.12.1/debian/patches/0006-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch
--- jocaml-3.12.0/debian/patches/0006-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/debian/patches/0006-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch	2011-12-01 13:02:24.000000000 +0000
@@ -0,0 +1,23 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Tue, 1 Nov 2011 15:28:15 +0100
+Subject: [PATCH] Do not add -R$dir in X11 link options on GNU/kFreeBSD
+
+Signed-off-by: Stephane Glondu <steph@glondu.net>
+Bug: http://caml.inria.fr/mantis/view.php?id=5393
+---
+ configure |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/configure b/configure
+index eb32dc0..7bcbdc0 100755
+--- a/configure
++++ b/configure
+@@ -1406,6 +1406,7 @@ do
+     else
+       x11_libs="-L$dir"
+       case "$host" in
++        *-kfreebsd*-gnu) x11_link="-L$dir -lX11";;
+         *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
+         *) x11_link="-L$dir -lX11";;
+       esac
+-- 
diff -Nru jocaml-3.12.0/debian/patches/0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch jocaml-3.12.1/debian/patches/0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch
--- jocaml-3.12.0/debian/patches/0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch	2011-12-01 13:02:23.000000000 +0000
+++ jocaml-3.12.1/debian/patches/0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,124 +0,0 @@
-From: Stephane Glondu <steph@glondu.net>
-Date: Fri, 12 Aug 2011 21:13:17 +0200
-Subject: ocamlopt/arm: add .type directive for code symbols
-
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/810402
-Signed-off-by: Stephane Glondu <steph@glondu.net>
----
- asmcomp/arm/emit.mlp |    1 +
- asmrun/arm.S         |   12 ++++++++++++
- 2 files changed, 13 insertions(+), 0 deletions(-)
-
-diff --git a/asmcomp/arm/emit.mlp b/asmcomp/arm/emit.mlp
-index 2003313..a4b2241 100644
---- a/asmcomp/arm/emit.mlp
-+++ b/asmcomp/arm/emit.mlp
-@@ -556,6 +556,7 @@ let fundecl fundecl =
-   `	.text\n`;
-   `	.align	2\n`;
-   `	.global	{emit_symbol fundecl.fun_name}\n`;
-+  `	.type	{emit_symbol fundecl.fun_name}, %function\n`;
-   `{emit_symbol fundecl.fun_name}:\n`;
-   let n = frame_size() in
-   ignore(emit_stack_adjustment "sub" n);
-diff --git a/asmrun/arm.S b/asmrun/arm.S
-index 164f731..1313e9c 100644
---- a/asmrun/arm.S
-+++ b/asmrun/arm.S
-@@ -24,6 +24,7 @@ alloc_limit     .req    r10
- /* Allocation functions and GC interface */
- 
-         .globl caml_call_gc
-+        .type caml_call_gc, %function
- caml_call_gc:
-     /* Record return address and desired size */
-     /* Can use alloc_limit as a temporary since it will be reloaded by
-@@ -41,6 +42,7 @@ caml_call_gc:
-         bx      lr
- 
-         .globl caml_alloc1
-+        .type caml_alloc1, %function
- caml_alloc1:
-         sub     alloc_ptr, alloc_ptr, #8
-         cmp     alloc_ptr, alloc_limit
-@@ -54,6 +56,7 @@ caml_alloc1:
-         b       caml_alloc1
- 
-         .globl caml_alloc2
-+        .type caml_alloc2, %function
- caml_alloc2:
-         sub     alloc_ptr, alloc_ptr, #12
-         cmp     alloc_ptr, alloc_limit
-@@ -67,6 +70,7 @@ caml_alloc2:
-         b       caml_alloc2
- 
-         .globl caml_alloc3
-+        .type caml_alloc3, %function
- caml_alloc3:
-         sub     alloc_ptr, alloc_ptr, #16
-         cmp     alloc_ptr, alloc_limit
-@@ -80,6 +84,7 @@ caml_alloc3:
-         b       caml_alloc3
- 
-         .globl caml_allocN
-+        .type caml_allocN, %function
- caml_allocN:
-         sub     alloc_ptr, alloc_ptr, r12
-         cmp     alloc_ptr, alloc_limit
-@@ -134,6 +139,7 @@ caml_allocN:
- /* Function to call is in r12 */
- 
-         .globl caml_c_call
-+        .type caml_c_call, %function
- caml_c_call:
-     /* Preserve return address in callee-save register r4 */
-         mov     r4, lr
-@@ -160,6 +166,7 @@ caml_c_call:
- /* Start the Caml program */
- 
-         .globl caml_start_program
-+        .type caml_start_program, %function
- caml_start_program:
-         ldr     r12, .Lcaml_program
- 
-@@ -235,6 +242,7 @@ caml_start_program:
- /* Raise an exception from C */
- 
-         .globl caml_raise_exception
-+        .type caml_raise_exception, %function
- caml_raise_exception:
-     /* Reload Caml allocation pointers */
-         ldr     r12, .Lcaml_young_ptr
-@@ -250,6 +258,7 @@ caml_raise_exception:
- /* Callback from C to Caml */
- 
-         .globl caml_callback_exn
-+        .type caml_callback_exn, %function
- caml_callback_exn:
-     /* Initial shuffling of arguments (r0 = closure, r1 = first arg) */
-         mov     r12, r0
-@@ -259,6 +268,7 @@ caml_callback_exn:
-         b       .Ljump_to_caml
- 
-         .globl caml_callback2_exn
-+        .type caml_callback2_exn, %function
- caml_callback2_exn:
-     /* Initial shuffling of arguments (r0 = closure, r1 = arg1, r2 = arg2) */
-         mov     r12, r0
-@@ -269,6 +279,7 @@ caml_callback2_exn:
-         b       .Ljump_to_caml
- 
-         .globl caml_callback3_exn
-+        .type caml_callback3_exn, %function
- caml_callback3_exn:
-     /* Initial shuffling of arguments */
-     /* (r0 = closure, r1 = arg1, r2 = arg2, r3 = arg3) */
-@@ -281,6 +292,7 @@ caml_callback3_exn:
-         b       .Ljump_to_caml
- 
-         .globl caml_ml_array_bound_error
-+        .type caml_ml_array_bound_error, %function
- caml_ml_array_bound_error:
-     /* Load address of [caml_array_bound_error] in r12 */
-         ldr     r12, .Lcaml_array_bound_error
--- 
diff -Nru jocaml-3.12.0/debian/patches/series jocaml-3.12.1/debian/patches/series
--- jocaml-3.12.0/debian/patches/series	2011-12-01 13:02:23.000000000 +0000
+++ jocaml-3.12.1/debian/patches/series	2011-12-01 13:02:24.000000000 +0000
@@ -1,6 +1,7 @@
 0001-Pass-no-relax-to-ld-on-alpha.patch
 0001-Replace-Otyp_proc-with-Otyp_stuff-to-make-outcometre.patch
 0002-Add-option-v-to-expunge-to-select-modules-to-filter-.patch
-0003-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
-0004-Natdynlink-works-on-powerpc.patch
-0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch
+0003-Natdynlink-works-on-powerpc-and-hurd-i386.patch
+0004-ocamlopt-arm-add-.type-directive-for-code-symbols.patch
+0005-Add-support-for-ENOTSUP.patch
+0006-Do-not-add-R-dir-in-X11-link-options-on-GNU-kFreeBSD.patch
diff -Nru jocaml-3.12.0/.depend jocaml-3.12.1/.depend
--- jocaml-3.12.0/.depend	2010-06-04 19:21:20.000000000 +0000
+++ jocaml-3.12.1/.depend	2011-07-07 14:32:00.000000000 +0000
@@ -343,13 +343,13 @@
 bytecomp/typeopt.cmi: typing/types.cmi typing/typedtree.cmi typing/path.cmi \
     bytecomp/lambda.cmi typing/env.cmi
 bytecomp/bytegen.cmo: typing/types.cmi bytecomp/switch.cmi typing/subst.cmi \
-    typing/stypes.cmi typing/primitive.cmi utils/misc.cmi bytecomp/lambda.cmi \
+    typing/primitive.cmi utils/misc.cmi bytecomp/lambda.cmi \
     bytecomp/instruct.cmi typing/ident.cmi utils/config.cmi \
-    parsing/asttypes.cmi typing/annot.cmi bytecomp/bytegen.cmi
+    parsing/asttypes.cmi bytecomp/bytegen.cmi
 bytecomp/bytegen.cmx: typing/types.cmx bytecomp/switch.cmx typing/subst.cmx \
-    typing/stypes.cmx typing/primitive.cmx utils/misc.cmx bytecomp/lambda.cmx \
+    typing/primitive.cmx utils/misc.cmx bytecomp/lambda.cmx \
     bytecomp/instruct.cmx typing/ident.cmx utils/config.cmx \
-    parsing/asttypes.cmi typing/annot.cmi bytecomp/bytegen.cmi
+    parsing/asttypes.cmi bytecomp/bytegen.cmi
 bytecomp/bytelibrarian.cmo: utils/misc.cmi utils/config.cmi \
     bytecomp/cmo_format.cmi utils/clflags.cmi bytecomp/bytelink.cmi \
     bytecomp/bytelibrarian.cmi
@@ -432,10 +432,12 @@
     parsing/asttypes.cmi bytecomp/printlambda.cmi
 bytecomp/runtimedef.cmo: bytecomp/runtimedef.cmi
 bytecomp/runtimedef.cmx: bytecomp/runtimedef.cmi
-bytecomp/simplif.cmo: bytecomp/lambda.cmi typing/ident.cmi utils/clflags.cmi \
-    parsing/asttypes.cmi bytecomp/simplif.cmi
-bytecomp/simplif.cmx: bytecomp/lambda.cmx typing/ident.cmx utils/clflags.cmx \
-    parsing/asttypes.cmi bytecomp/simplif.cmi
+bytecomp/simplif.cmo: typing/stypes.cmi bytecomp/lambda.cmi typing/ident.cmi \
+    utils/clflags.cmi parsing/asttypes.cmi typing/annot.cmi \
+    bytecomp/simplif.cmi
+bytecomp/simplif.cmx: typing/stypes.cmx bytecomp/lambda.cmx typing/ident.cmx \
+    utils/clflags.cmx parsing/asttypes.cmi typing/annot.cmi \
+    bytecomp/simplif.cmi
 bytecomp/switch.cmo: bytecomp/switch.cmi
 bytecomp/switch.cmx: bytecomp/switch.cmi
 bytecomp/symtable.cmo: utils/tbl.cmi bytecomp/runtimedef.cmi \
@@ -519,9 +521,9 @@
 asmcomp/clambda.cmi: bytecomp/lambda.cmi typing/ident.cmi \
     asmcomp/debuginfo.cmi parsing/asttypes.cmi
 asmcomp/closure.cmi: bytecomp/lambda.cmi asmcomp/clambda.cmi
+asmcomp/cmm.cmi: typing/ident.cmi asmcomp/debuginfo.cmi
 asmcomp/cmmgen.cmi: asmcomp/cmx_format.cmi asmcomp/cmm.cmi \
     asmcomp/clambda.cmi
-asmcomp/cmm.cmi: typing/ident.cmi asmcomp/debuginfo.cmi
 asmcomp/cmx_format.cmi: asmcomp/clambda.cmi
 asmcomp/codegen.cmi: asmcomp/cmm.cmi
 asmcomp/coloring.cmi:
@@ -529,8 +531,8 @@
 asmcomp/compilenv.cmi: typing/ident.cmi asmcomp/cmx_format.cmi \
     asmcomp/clambda.cmi
 asmcomp/debuginfo.cmi: parsing/location.cmi bytecomp/lambda.cmi
-asmcomp/emitaux.cmi: asmcomp/debuginfo.cmi
 asmcomp/emit.cmi: asmcomp/linearize.cmi asmcomp/cmm.cmi
+asmcomp/emitaux.cmi: asmcomp/debuginfo.cmi
 asmcomp/interf.cmi: asmcomp/mach.cmi
 asmcomp/linearize.cmi: asmcomp/reg.cmi asmcomp/mach.cmi asmcomp/debuginfo.cmi
 asmcomp/liveness.cmi: asmcomp/mach.cmi
@@ -541,8 +543,8 @@
 asmcomp/printmach.cmi: asmcomp/reg.cmi asmcomp/mach.cmi
 asmcomp/proc.cmi: asmcomp/reg.cmi asmcomp/mach.cmi
 asmcomp/reg.cmi: asmcomp/cmm.cmi
-asmcomp/reloadgen.cmi: asmcomp/reg.cmi asmcomp/mach.cmi
 asmcomp/reload.cmi: asmcomp/mach.cmi
+asmcomp/reloadgen.cmi: asmcomp/reg.cmi asmcomp/mach.cmi
 asmcomp/schedgen.cmi: asmcomp/mach.cmi asmcomp/linearize.cmi
 asmcomp/scheduling.cmi: asmcomp/linearize.cmi
 asmcomp/selectgen.cmi: utils/tbl.cmi asmcomp/reg.cmi asmcomp/mach.cmi \
@@ -612,6 +614,10 @@
     utils/misc.cmx bytecomp/lambda.cmx typing/ident.cmx asmcomp/debuginfo.cmx \
     asmcomp/compilenv.cmx utils/clflags.cmx asmcomp/clambda.cmx \
     parsing/asttypes.cmi asmcomp/closure.cmi
+asmcomp/cmm.cmo: typing/ident.cmi asmcomp/debuginfo.cmi asmcomp/arch.cmo \
+    asmcomp/cmm.cmi
+asmcomp/cmm.cmx: typing/ident.cmx asmcomp/debuginfo.cmx asmcomp/arch.cmx \
+    asmcomp/cmm.cmi
 asmcomp/cmmgen.cmo: typing/types.cmi bytecomp/switch.cmi asmcomp/proc.cmi \
     typing/primitive.cmi utils/misc.cmi bytecomp/lambda.cmi typing/ident.cmi \
     asmcomp/debuginfo.cmi utils/config.cmi asmcomp/compilenv.cmi \
@@ -624,10 +630,6 @@
     asmcomp/cmx_format.cmi asmcomp/cmm.cmx utils/clflags.cmx \
     asmcomp/clambda.cmx parsing/asttypes.cmi asmcomp/arch.cmx \
     asmcomp/cmmgen.cmi
-asmcomp/cmm.cmo: typing/ident.cmi asmcomp/debuginfo.cmi asmcomp/arch.cmo \
-    asmcomp/cmm.cmi
-asmcomp/cmm.cmx: typing/ident.cmx asmcomp/debuginfo.cmx asmcomp/arch.cmx \
-    asmcomp/cmm.cmi
 asmcomp/codegen.cmo: asmcomp/split.cmi asmcomp/spill.cmi asmcomp/reload.cmi \
     asmcomp/reg.cmi asmcomp/printmach.cmi asmcomp/printlinear.cmi \
     asmcomp/printcmm.cmi asmcomp/liveness.cmi asmcomp/linearize.cmi \
@@ -641,9 +643,9 @@
 asmcomp/coloring.cmo: asmcomp/reg.cmi asmcomp/proc.cmi asmcomp/coloring.cmi
 asmcomp/coloring.cmx: asmcomp/reg.cmx asmcomp/proc.cmx asmcomp/coloring.cmi
 asmcomp/comballoc.cmo: asmcomp/reg.cmi asmcomp/mach.cmi utils/config.cmi \
-    asmcomp/comballoc.cmi
+    asmcomp/arch.cmo asmcomp/comballoc.cmi
 asmcomp/comballoc.cmx: asmcomp/reg.cmx asmcomp/mach.cmx utils/config.cmx \
-    asmcomp/comballoc.cmi
+    asmcomp/arch.cmx asmcomp/comballoc.cmi
 asmcomp/compilenv.cmo: utils/misc.cmi typing/ident.cmi typing/env.cmi \
     utils/config.cmi asmcomp/cmx_format.cmi asmcomp/clambda.cmi \
     asmcomp/compilenv.cmi
@@ -654,12 +656,6 @@
     asmcomp/debuginfo.cmi
 asmcomp/debuginfo.cmx: parsing/location.cmx bytecomp/lambda.cmx \
     asmcomp/debuginfo.cmi
-asmcomp/emitaux.cmo: asmcomp/reg.cmi asmcomp/linearize.cmi \
-    asmcomp/debuginfo.cmi asmcomp/cmm.cmi asmcomp/arch.cmo \
-    asmcomp/emitaux.cmi
-asmcomp/emitaux.cmx: asmcomp/reg.cmx asmcomp/linearize.cmx \
-    asmcomp/debuginfo.cmx asmcomp/cmm.cmx asmcomp/arch.cmx \
-    asmcomp/emitaux.cmi
 asmcomp/emit.cmo: asmcomp/reg.cmi asmcomp/proc.cmi utils/misc.cmi \
     asmcomp/mach.cmi asmcomp/linearize.cmi asmcomp/emitaux.cmi \
     asmcomp/debuginfo.cmi utils/config.cmi asmcomp/compilenv.cmi \
@@ -668,6 +664,12 @@
     asmcomp/mach.cmx asmcomp/linearize.cmx asmcomp/emitaux.cmx \
     asmcomp/debuginfo.cmx utils/config.cmx asmcomp/compilenv.cmx \
     asmcomp/cmm.cmx utils/clflags.cmx asmcomp/arch.cmx asmcomp/emit.cmi
+asmcomp/emitaux.cmo: asmcomp/reg.cmi asmcomp/linearize.cmi \
+    asmcomp/debuginfo.cmi asmcomp/cmm.cmi asmcomp/arch.cmo \
+    asmcomp/emitaux.cmi
+asmcomp/emitaux.cmx: asmcomp/reg.cmx asmcomp/linearize.cmx \
+    asmcomp/debuginfo.cmx asmcomp/cmm.cmx asmcomp/arch.cmx \
+    asmcomp/emitaux.cmi
 asmcomp/interf.cmo: asmcomp/reg.cmi asmcomp/proc.cmi utils/misc.cmi \
     asmcomp/mach.cmi asmcomp/interf.cmi
 asmcomp/interf.cmx: asmcomp/reg.cmx asmcomp/proc.cmx utils/misc.cmx \
@@ -708,14 +710,14 @@
     asmcomp/proc.cmi
 asmcomp/reg.cmo: asmcomp/cmm.cmi asmcomp/reg.cmi
 asmcomp/reg.cmx: asmcomp/cmm.cmx asmcomp/reg.cmi
-asmcomp/reloadgen.cmo: asmcomp/reg.cmi utils/misc.cmi asmcomp/mach.cmi \
-    asmcomp/reloadgen.cmi
-asmcomp/reloadgen.cmx: asmcomp/reg.cmx utils/misc.cmx asmcomp/mach.cmx \
-    asmcomp/reloadgen.cmi
 asmcomp/reload.cmo: asmcomp/reloadgen.cmi asmcomp/reg.cmi asmcomp/mach.cmi \
     asmcomp/cmm.cmi utils/clflags.cmi asmcomp/arch.cmo asmcomp/reload.cmi
 asmcomp/reload.cmx: asmcomp/reloadgen.cmx asmcomp/reg.cmx asmcomp/mach.cmx \
     asmcomp/cmm.cmx utils/clflags.cmx asmcomp/arch.cmx asmcomp/reload.cmi
+asmcomp/reloadgen.cmo: asmcomp/reg.cmi utils/misc.cmi asmcomp/mach.cmi \
+    asmcomp/reloadgen.cmi
+asmcomp/reloadgen.cmx: asmcomp/reg.cmx utils/misc.cmx asmcomp/mach.cmx \
+    asmcomp/reloadgen.cmi
 asmcomp/schedgen.cmo: asmcomp/reg.cmi utils/misc.cmi asmcomp/mach.cmi \
     asmcomp/linearize.cmi asmcomp/cmm.cmi asmcomp/arch.cmo \
     asmcomp/schedgen.cmi
@@ -724,12 +726,14 @@
     asmcomp/schedgen.cmi
 asmcomp/scheduling.cmo: asmcomp/schedgen.cmi asmcomp/scheduling.cmi
 asmcomp/scheduling.cmx: asmcomp/schedgen.cmx asmcomp/scheduling.cmi
-asmcomp/selectgen.cmo: utils/tbl.cmi asmcomp/reg.cmi asmcomp/proc.cmi \
-    utils/misc.cmi asmcomp/mach.cmi typing/ident.cmi asmcomp/debuginfo.cmi \
-    asmcomp/cmm.cmi asmcomp/arch.cmo asmcomp/selectgen.cmi
-asmcomp/selectgen.cmx: utils/tbl.cmx asmcomp/reg.cmx asmcomp/proc.cmx \
-    utils/misc.cmx asmcomp/mach.cmx typing/ident.cmx asmcomp/debuginfo.cmx \
-    asmcomp/cmm.cmx asmcomp/arch.cmx asmcomp/selectgen.cmi
+asmcomp/selectgen.cmo: utils/tbl.cmi bytecomp/simplif.cmi asmcomp/reg.cmi \
+    asmcomp/proc.cmi utils/misc.cmi asmcomp/mach.cmi typing/ident.cmi \
+    asmcomp/debuginfo.cmi asmcomp/cmm.cmi asmcomp/arch.cmo \
+    asmcomp/selectgen.cmi
+asmcomp/selectgen.cmx: utils/tbl.cmx bytecomp/simplif.cmx asmcomp/reg.cmx \
+    asmcomp/proc.cmx utils/misc.cmx asmcomp/mach.cmx typing/ident.cmx \
+    asmcomp/debuginfo.cmx asmcomp/cmm.cmx asmcomp/arch.cmx \
+    asmcomp/selectgen.cmi
 asmcomp/selection.cmo: asmcomp/selectgen.cmi asmcomp/reg.cmi asmcomp/proc.cmi \
     utils/misc.cmi asmcomp/mach.cmi asmcomp/debuginfo.cmi asmcomp/cmm.cmi \
     utils/clflags.cmi asmcomp/arch.cmo asmcomp/selection.cmi
@@ -746,8 +750,8 @@
     asmcomp/split.cmi
 driver/compile.cmi: typing/env.cmi
 driver/errors.cmi:
-driver/main_args.cmi:
 driver/main.cmi:
+driver/main_args.cmi:
 driver/optcompile.cmi: typing/env.cmi
 driver/opterrors.cmi:
 driver/optmain.cmi:
@@ -780,8 +784,6 @@
     parsing/location.cmx parsing/lexer.cmx typing/includemod.cmx \
     typing/env.cmx typing/ctype.cmx bytecomp/bytepackager.cmx \
     bytecomp/bytelink.cmx bytecomp/bytelibrarian.cmx driver/errors.cmi
-driver/main_args.cmo: utils/warnings.cmi driver/main_args.cmi
-driver/main_args.cmx: utils/warnings.cmx driver/main_args.cmi
 driver/main.cmo: utils/warnings.cmi utils/misc.cmi driver/main_args.cmi \
     driver/errors.cmi utils/config.cmi driver/compile.cmi utils/clflags.cmi \
     bytecomp/bytepackager.cmi bytecomp/bytelink.cmi \
@@ -790,6 +792,8 @@
     driver/errors.cmx utils/config.cmx driver/compile.cmx utils/clflags.cmx \
     bytecomp/bytepackager.cmx bytecomp/bytelink.cmx \
     bytecomp/bytelibrarian.cmx driver/main.cmi
+driver/main_args.cmo: utils/warnings.cmi driver/main_args.cmi
+driver/main_args.cmx: utils/warnings.cmx driver/main_args.cmi
 driver/optcompile.cmo: utils/warnings.cmi typing/unused_var.cmi \
     typing/typemod.cmi typing/typedtree.cmi bytecomp/translmod.cmi \
     typing/stypes.cmi bytecomp/simplif.cmi typing/printtyp.cmi \
diff -Nru jocaml-3.12.0/emacs/camldebug.el jocaml-3.12.1/emacs/camldebug.el
--- jocaml-3.12.0/emacs/camldebug.el	2010-06-04 19:19:48.000000000 +0000
+++ jocaml-3.12.1/emacs/camldebug.el	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 ;(*                                                                     *)
 ;(***********************************************************************)
 
-;(* $Id: camldebug.el 10520 2010-06-04 19:19:48Z maranget $ *)
+;(* $Id: camldebug.el 11113 2011-07-07 14:32:00Z maranget $ *)
 
 ;;; Run camldebug under Emacs
 ;;; Derived from gdb.el.
@@ -302,8 +302,8 @@
                    ((save-excursion
                       (beginning-of-line 1)
                       (looking-at "^Time : \\([0-9]+\\) - pc : [0-9]+ "))
-                    (string-to-int (match-string 1)))
-                   ((string-to-int (camldebug-format-command "%e"))))))
+                    (caml-string-to-int (match-string 1)))
+                   ((caml-string-to-int (camldebug-format-command "%e"))))))
         (camldebug-call "goto" nil time)))
    (t
     (let ((module (camldebug-module-name (buffer-file-name)))
@@ -325,7 +325,7 @@
                                    " - module "
                                    module "$") nil t)
                           (match-string 1)))))
-      (if address (camldebug-call "goto" nil (string-to-int address))
+      (if address (camldebug-call "goto" nil (caml-string-to-int address))
         (error "No time at %s at %s" module camldebug-goto-position))))))
 
 
@@ -383,12 +383,12 @@
            (arg (cond
                  ((eobp)
                   (save-excursion (re-search-backward bpline nil t))
-                  (string-to-int (match-string 1)))
+                  (caml-string-to-int (match-string 1)))
                  ((save-excursion
                     (beginning-of-line 1)
                     (looking-at bpline))
-                  (string-to-int (match-string 1)))
-                 ((string-to-int (camldebug-format-command "%e"))))))
+                  (caml-string-to-int (match-string 1)))
+                 ((caml-string-to-int (camldebug-format-command "%e"))))))
       (camldebug-call "delete" nil arg)))
    (t
     (let ((camldebug-delete-file
@@ -409,7 +409,7 @@
                      camldebug-delete-file
                      camldebug-delete-position)
             (camldebug-call "delete" nil
-                            (string-to-int camldebug-delete-output)))))))))
+                            (caml-string-to-int camldebug-delete-output)))))))))
 
 (defun camldebug-complete-filter (string)
   (setq camldebug-filter-accumulator
@@ -529,9 +529,9 @@
               (let ((isbefore
                      (string= "before"
                               (match-string 5 camldebug-filter-accumulator)))
-                    (startpos (string-to-int
+                    (startpos (caml-string-to-int
                                (match-string 3 camldebug-filter-accumulator)))
-                    (endpos (string-to-int
+                    (endpos (caml-string-to-int
                              (match-string 4 camldebug-filter-accumulator))))
                 (list (match-string 2 camldebug-filter-accumulator)
                       (if isbefore startpos endpos)
@@ -704,7 +704,7 @@
         (move-overlay camldebug-overlay-under spos (- epos 1) buffer))
     (save-excursion
       (set-buffer buffer)
-      (goto-char pos)
+      (goto-char spos)
       (beginning-of-line)
       (move-marker camldebug-event-marker (point))
       (setq overlay-arrow-position camldebug-event-marker))))
diff -Nru jocaml-3.12.0/emacs/caml.el jocaml-3.12.1/emacs/caml.el
--- jocaml-3.12.0/emacs/caml.el	2009-08-21 08:39:33.000000000 +0000
+++ jocaml-3.12.1/emacs/caml.el	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 ;(*                                                                     *)
 ;(***********************************************************************)
 
-;(* $Id: caml.el 9322 2009-08-21 08:39:33Z maranget $ *)
+;(* $Id: caml.el 11113 2011-07-07 14:32:00Z maranget $ *)
 
 ;;; caml.el --- O'Caml code editing commands for Emacs
 ;; Luc Maranget, January 2008. A few jocaml additions.
@@ -815,8 +815,9 @@
 (defvar caml-error-overlay nil)
 (defvar caml-next-error-skip-warnings-flag nil)
 
-(defun caml-string-to-int (x)
-  (if (fboundp 'string-to-number) (string-to-number x) (string-to-int x)))
+(if (fboundp 'string-to-number)
+   (defalias 'caml-string-to-int 'string-to-number)
+ (defalias 'caml-string-to-int 'string-to-int))
 
 ;;itz 04-21-96 somebody didn't get the documentation for next-error
 ;;right. When the optional argument is a number n, it should move
@@ -1168,7 +1169,7 @@
   (concat
    "\\<\\(and"
    (if caml-is-jocaml "\\|or" "")
-   "\\|do\\(ne\\)?\\|e\\(lse\\|nd\\)\\|in\\|t\\(hen\\|o\\)"
+   "\\<\\(and\\|do\\(ne\\|wnto\\)?\\|e\\(lse\\|nd\\)\\|in\\|t\\(hen\\|o\\)"
    "\\|with\\)\\>\\|[^[|]|")
   "Regexp used in caml mode for skipping back over nested blocks.")
 
@@ -1184,6 +1185,7 @@
     ("else" . caml-find-else-match)
     ("then" . caml-find-then-match)
     ("to" . caml-find-done-match)
+    ("downto" . caml-find-done-match)
     ("do" . caml-find-done-match)
     ("and" . caml-find-and-match))))
     (if caml-is-jocaml (cons '("or" . caml-find-and-match) aux) aux))
@@ -1611,7 +1613,7 @@
 
 (defconst caml-leading-kwops-regexp
   (concat
-   "\\<\\(and\\|do\\(ne\\)?\\|e\\(lse\\|nd\\)\\|in"
+   "\\<\\(and\\|do\\(ne\\|wnto\\)?\\|e\\(lse\\|nd\\)\\|in"
    (if caml-is-jocaml "\\|or" "")
    "\\|t\\(hen\\|o\\)\\|with\\)\\>\\|[]|})]")
 
@@ -1628,6 +1630,7 @@
 	  ("in" caml-in-extra-indent 2)
 	  ("then" caml-then-extra-indent 3)
 	  ("to" caml-to-extra-indent 0)
+	  ("downto" caml-to-extra-indent 0)
 	  ("with" caml-with-extra-indent 2)
 	  ("|" caml-|-extra-indent 2)
 	  ("]" caml-rb-extra-indent 0)
diff -Nru jocaml-3.12.0/emacs/caml-emacs.el jocaml-3.12.1/emacs/caml-emacs.el
--- jocaml-3.12.0/emacs/caml-emacs.el	2005-05-04 20:30:00.000000000 +0000
+++ jocaml-3.12.1/emacs/caml-emacs.el	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 ;(*                                                                     *)
 ;(***********************************************************************)
 
-;(* $Id: caml-emacs.el 6857 2005-05-04 20:30:00Z habouzit $ *)
+;(* $Id: caml-emacs.el 11113 2011-07-07 14:32:00Z maranget $ *)
 
 ;; for caml-help.el
 (defalias 'caml-info-other-window 'info-other-window)
@@ -39,5 +39,8 @@
          (or (member 'drag modifiers)
              (member 'click modifiers)))))
 
+(if (fboundp 'string-to-number)
+   (defalias 'caml-string-to-int 'string-to-number)
+ (defalias 'caml-string-to-int 'string-to-int))
 
 (provide 'caml-emacs)
diff -Nru jocaml-3.12.0/emacs/caml-font.el jocaml-3.12.1/emacs/caml-font.el
--- jocaml-3.12.0/emacs/caml-font.el	2010-06-04 19:19:48.000000000 +0000
+++ jocaml-3.12.1/emacs/caml-font.el	2011-07-07 14:32:00.000000000 +0000
@@ -59,7 +59,7 @@
     . font-lock-builtin-face)
 ;control
    (,(concat "[|#&]\\|->\\|"
-             (regexp-opt '("do" "done" "dowto" "else" "for" "if" "ignore"
+             (regexp-opt '("do" "done" "downto" "else" "for" "if" "ignore"
                            "lazy" "match" "new" "reply"
 			   "spawn" "then" "to" "try"
                            "when" "while" "with")
diff -Nru jocaml-3.12.0/emacs/caml-types.el jocaml-3.12.1/emacs/caml-types.el
--- jocaml-3.12.0/emacs/caml-types.el	2010-03-09 15:46:32.000000000 +0000
+++ jocaml-3.12.1/emacs/caml-types.el	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 ;(*                                                                     *)
 ;(***********************************************************************)
 
-;(* $Id: caml-types.el 9641 2010-03-09 15:46:32Z maranget $ *)
+;(* $Id: caml-types.el 11113 2011-07-07 14:32:00Z maranget $ *)
 
 ; An emacs-lisp complement to the "-annot" option of ocamlc and ocamlopt.
 
@@ -264,13 +264,13 @@
              ((string-match def-re kind)
               (let ((var-name (match-string 1 kind))
                     (l-file (file-name-nondirectory (match-string 2 kind)))
-                    (l-line (string-to-int (match-string 4 kind)))
-                    (l-bol (string-to-int (match-string 5 kind)))
-                    (l-cnum (string-to-int (match-string 6 kind)))
+                    (l-line (caml-string-to-int (match-string 4 kind)))
+                    (l-bol (caml-string-to-int (match-string 5 kind)))
+                    (l-cnum (caml-string-to-int (match-string 6 kind)))
                     (r-file (file-name-nondirectory (match-string 7 kind)))
-                    (r-line (string-to-int (match-string 9 kind)))
-                    (r-bol (string-to-int (match-string 10 kind)))
-                    (r-cnum (string-to-int (match-string 11 kind))))
+                    (r-line (caml-string-to-int (match-string 9 kind)))
+                    (r-bol (caml-string-to-int (match-string 10 kind)))
+                    (r-cnum (caml-string-to-int (match-string 11 kind))))
                 (let* ((lpos (vector l-file l-line l-bol l-cnum))
                        (rpos (vector r-file r-line r-bol r-cnum))
                        (left (caml-types-get-pos target-buf lpos))
@@ -280,9 +280,9 @@
              ((string-match def-end-re kind)
               (let ((var-name (match-string 1 kind))
                     (l-file (file-name-nondirectory (match-string 2 kind)))
-                    (l-line (string-to-int (match-string 4 kind)))
-                    (l-bol (string-to-int (match-string 5 kind)))
-                    (l-cnum (string-to-int (match-string 6 kind))))
+                    (l-line (caml-string-to-int (match-string 4 kind)))
+                    (l-bol (caml-string-to-int (match-string 5 kind)))
+                    (l-cnum (caml-string-to-int (match-string 6 kind))))
                 (let* ((lpos (vector l-file l-line l-bol l-cnum))
                        (left (caml-types-get-pos target-buf lpos))
                        (right (buffer-size target-buf)))
@@ -291,13 +291,13 @@
              ((string-match internal-re kind)
               (let ((var-name (match-string 1 kind))
                     (l-file (file-name-nondirectory (match-string 2 kind)))
-                    (l-line (string-to-int (match-string 4 kind)))
-                    (l-bol (string-to-int (match-string 5 kind)))
-                    (l-cnum (string-to-int (match-string 6 kind)))
+                    (l-line (caml-string-to-int (match-string 4 kind)))
+                    (l-bol (caml-string-to-int (match-string 5 kind)))
+                    (l-cnum (caml-string-to-int (match-string 6 kind)))
                     (r-file (file-name-nondirectory (match-string 7 kind)))
-                    (r-line (string-to-int (match-string 9 kind)))
-                    (r-bol (string-to-int (match-string 10 kind)))
-                    (r-cnum (string-to-int (match-string 11 kind))))
+                    (r-line (caml-string-to-int (match-string 9 kind)))
+                    (r-bol (caml-string-to-int (match-string 10 kind)))
+                    (r-cnum (caml-string-to-int (match-string 11 kind))))
                 (let* ((lpos (vector l-file l-line l-bol l-cnum))
                        (rpos (vector r-file r-line r-bol r-cnum))
                        (left (caml-types-get-pos target-buf lpos))
@@ -345,11 +345,12 @@
         (message "done"))
       )))
 
+(defun caml-types-parent-dir (d) (file-name-directory (directory-file-name d)))
+
 (defun caml-types-locate-type-file (target-path)
  (let ((sibling (concat (file-name-sans-extension target-path) ".annot")))
    (if (file-exists-p sibling)
        sibling
-     (defun parent-dir (d) (file-name-directory (directory-file-name d)))
      (let ((project-dir (file-name-directory sibling))
            type-path)
        (while (not (file-exists-p
@@ -357,10 +358,10 @@
                           (expand-file-name
                            (file-relative-name sibling project-dir)
                            (expand-file-name "_build" project-dir)))))
-         (if (equal project-dir (parent-dir project-dir))
+         (if (equal project-dir (caml-types-parent-dir project-dir))
              (error (concat "No annotation file. "
                             "You should compile with option \"-annot\".")))
-         (setq project-dir (parent-dir project-dir)))
+         (setq project-dir (caml-types-parent-dir project-dir)))
        type-path))))
 
 (defun caml-types-date< (date1 date2)
@@ -400,13 +401,13 @@
         (annotation ()))
     (while (re-search-forward caml-types-location-re () t)
       (let ((l-file (file-name-nondirectory (match-string 1)))
-            (l-line (string-to-int (match-string 3)))
-            (l-bol (string-to-int (match-string 4)))
-            (l-cnum (string-to-int (match-string 5)))
+            (l-line (caml-string-to-int (match-string 3)))
+            (l-bol (caml-string-to-int (match-string 4)))
+            (l-cnum (caml-string-to-int (match-string 5)))
             (r-file (file-name-nondirectory (match-string 6)))
-            (r-line (string-to-int (match-string 8)))
-            (r-bol (string-to-int (match-string 9)))
-            (r-cnum (string-to-int (match-string 10))))
+            (r-line (caml-string-to-int (match-string 8)))
+            (r-bol (caml-string-to-int (match-string 9)))
+            (r-cnum (caml-string-to-int (match-string 10))))
         (unless (caml-types-not-in-file l-file r-file target-file)
           (setq annotation ())
           (while (next-annotation)
diff -Nru jocaml-3.12.0/emacs/caml-xemacs.el jocaml-3.12.1/emacs/caml-xemacs.el
--- jocaml-3.12.0/emacs/caml-xemacs.el	2005-05-04 20:30:00.000000000 +0000
+++ jocaml-3.12.1/emacs/caml-xemacs.el	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 ;(*                                                                     *)
 ;(***********************************************************************)
 
-;(* $Id: caml-xemacs.el 6857 2005-05-04 20:30:00Z habouzit $ *)
+;(* $Id: caml-xemacs.el 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (require 'overlay)
 
@@ -50,4 +50,8 @@
   (and (button-release-event-p event)
        (equal (event-button original) (event-button event))))
 
+(if (fboundp 'string-to-number)
+   (defalias 'caml-string-to-int 'string-to-number)
+ (defalias 'caml-string-to-int 'string-to-int))
+
 (provide 'caml-xemacs)
diff -Nru jocaml-3.12.0/emacs/inf-caml.el jocaml-3.12.1/emacs/inf-caml.el
--- jocaml-3.12.0/emacs/inf-caml.el	2010-06-04 19:19:48.000000000 +0000
+++ jocaml-3.12.1/emacs/inf-caml.el	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 ;(*                                                                     *)
 ;(***********************************************************************)
 
-;(* $Id: inf-caml.el 10520 2010-06-04 19:19:48Z maranget $ *)
+;(* $Id: inf-caml.el 11113 2011-07-07 14:32:00Z maranget $ *)
 
 ;;; inf-caml.el --- run the Caml toplevel in an Emacs buffer
 
@@ -163,7 +163,7 @@
       (setq count (+ count 1)))
     (if  (equal (buffer-name (current-buffer))
                 inferior-caml-buffer-name)
-        (end-of-buffer))
+        (goto-char (point-max)))
     (while
         (> count 0)
       (previous-multiframe-window)
@@ -201,7 +201,7 @@
                   (re-search-backward
                    (concat comint-prompt-regexp
                            "[ \t]*Characters[ \t]+\\([0-9]+\\)-[0-9]+:$"))
-                  (string-to-int (match-string 1))))))
+                  (caml-string-to-int (match-string 1))))))
     (goto-char loc)))
 
 
@@ -265,8 +265,8 @@
           (cond ((re-search-forward
                   " *Characters \\([01-9][01-9]*\\)-\\([1-9][01-9]*\\):\n[^W]"
                   (point-max) t)
-                 (setq beg (string-to-int (caml-match-string 1)))
-                 (setq end (string-to-int (caml-match-string 2)))
+                 (setq beg (caml-string-to-int (caml-match-string 1)))
+                 (setq end (caml-string-to-int (caml-match-string 2)))
                  (switch-to-buffer buf)
                  (goto-char orig)
                  (forward-byte end)
@@ -330,7 +330,7 @@
                (beep) (if wait (read-event) (caml-sit-for 60)))
            (delete-overlay caml-error-overlay)))))
 
-;; wait some amount for ouput, that is, until inferior-caml-output is set
+;; wait some amount for output, that is, until inferior-caml-output is set
 ;; to true. Hence, interleaves sitting for shorts delays and checking the
 ;; flag. Give up after some time. Typing into the source buffer will cancel
 ;; waiting, i.e. may report 'No result yet'
diff -Nru jocaml-3.12.0/emacs/Makefile jocaml-3.12.1/emacs/Makefile
--- jocaml-3.12.0/emacs/Makefile	2010-06-04 19:19:48.000000000 +0000
+++ jocaml-3.12.1/emacs/Makefile	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 #                                                                       #
 #########################################################################
 
-# $Id: Makefile 10520 2010-06-04 19:19:48Z maranget $
+# $Id: Makefile 11113 2011-07-07 14:32:00Z maranget $
 
 include ../config/Makefile
 
@@ -72,5 +72,9 @@
 install-ocamltags: ocamltags
 	cp ocamltags $(SCRIPTDIR)/ocamltags
 
+# This is for testing purposes
+compile-only:
+	$(EMACS) --batch --eval '$(COMPILECMD)'
+
 clean:
-	rm -f ocamltags *~ #*#
+	rm -f ocamltags *~ #*# *.elc
diff -Nru jocaml-3.12.0/emacs/README jocaml-3.12.1/emacs/README
--- jocaml-3.12.0/emacs/README	2008-10-14 07:37:28.000000000 +0000
+++ jocaml-3.12.1/emacs/README	2008-10-14 07:37:28.000000000 +0000
@@ -1,4 +1,4 @@
-        O'Caml emacs mode, snapshot of $Date: 2008-10-14 09:37:28 +0200 (mar, 14 oct 2008) $
+        O'Caml emacs mode, snapshot of $Date: 2008-10-14 09:37:28 +0200 (Tue, 14 Oct 2008) $
 
 The files in this archive define a caml-mode for emacs, for editing
 Objective Caml and Objective Label programs, as well as an
diff -Nru jocaml-3.12.0/lex/.depend jocaml-3.12.1/lex/.depend
--- jocaml-3.12.0/lex/.depend	2009-08-21 08:39:33.000000000 +0000
+++ jocaml-3.12.1/lex/.depend	2011-07-07 14:32:00.000000000 +0000
@@ -1,34 +1,34 @@
-common.cmi: syntax.cmi lexgen.cmi 
-compact.cmi: lexgen.cmi 
-cset.cmi: 
-lexer.cmi: parser.cmi 
-lexgen.cmi: syntax.cmi 
-outputbis.cmi: syntax.cmi lexgen.cmi common.cmi 
-output.cmi: syntax.cmi lexgen.cmi compact.cmi common.cmi 
-parser.cmi: syntax.cmi 
-syntax.cmi: cset.cmi 
-table.cmi: 
-common.cmo: syntax.cmi lexgen.cmi common.cmi 
-common.cmx: syntax.cmx lexgen.cmx common.cmi 
-compact.cmo: table.cmi lexgen.cmi compact.cmi 
-compact.cmx: table.cmx lexgen.cmx compact.cmi 
-cset.cmo: cset.cmi 
-cset.cmx: cset.cmi 
-lexer.cmo: syntax.cmi parser.cmi lexer.cmi 
-lexer.cmx: syntax.cmx parser.cmx lexer.cmi 
-lexgen.cmo: table.cmi syntax.cmi cset.cmi lexgen.cmi 
-lexgen.cmx: table.cmx syntax.cmx cset.cmx lexgen.cmi 
+common.cmi: syntax.cmi lexgen.cmi
+compact.cmi: lexgen.cmi
+cset.cmi:
+lexer.cmi: parser.cmi
+lexgen.cmi: syntax.cmi
+output.cmi: syntax.cmi lexgen.cmi compact.cmi common.cmi
+outputbis.cmi: syntax.cmi lexgen.cmi common.cmi
+parser.cmi: syntax.cmi
+syntax.cmi: cset.cmi
+table.cmi:
+common.cmo: syntax.cmi lexgen.cmi common.cmi
+common.cmx: syntax.cmx lexgen.cmx common.cmi
+compact.cmo: table.cmi lexgen.cmi compact.cmi
+compact.cmx: table.cmx lexgen.cmx compact.cmi
+cset.cmo: cset.cmi
+cset.cmx: cset.cmi
+lexer.cmo: syntax.cmi parser.cmi lexer.cmi
+lexer.cmx: syntax.cmx parser.cmx lexer.cmi
+lexgen.cmo: table.cmi syntax.cmi cset.cmi lexgen.cmi
+lexgen.cmx: table.cmx syntax.cmx cset.cmx lexgen.cmi
 main.cmo: syntax.cmi parser.cmi outputbis.cmi output.cmi lexgen.cmi lexer.cmi \
-    cset.cmi compact.cmi common.cmi 
+    cset.cmi compact.cmi common.cmi
 main.cmx: syntax.cmx parser.cmx outputbis.cmx output.cmx lexgen.cmx lexer.cmx \
-    cset.cmx compact.cmx common.cmx 
-outputbis.cmo: syntax.cmi lexgen.cmi common.cmi outputbis.cmi 
-outputbis.cmx: syntax.cmx lexgen.cmx common.cmx outputbis.cmi 
-output.cmo: syntax.cmi lexgen.cmi compact.cmi common.cmi output.cmi 
-output.cmx: syntax.cmx lexgen.cmx compact.cmx common.cmx output.cmi 
-parser.cmo: syntax.cmi cset.cmi parser.cmi 
-parser.cmx: syntax.cmx cset.cmx parser.cmi 
-syntax.cmo: cset.cmi syntax.cmi 
-syntax.cmx: cset.cmx syntax.cmi 
-table.cmo: table.cmi 
-table.cmx: table.cmi 
+    cset.cmx compact.cmx common.cmx
+output.cmo: syntax.cmi lexgen.cmi compact.cmi common.cmi output.cmi
+output.cmx: syntax.cmx lexgen.cmx compact.cmx common.cmx output.cmi
+outputbis.cmo: syntax.cmi lexgen.cmi common.cmi outputbis.cmi
+outputbis.cmx: syntax.cmx lexgen.cmx common.cmx outputbis.cmi
+parser.cmo: syntax.cmi cset.cmi parser.cmi
+parser.cmx: syntax.cmx cset.cmx parser.cmi
+syntax.cmo: cset.cmi syntax.cmi
+syntax.cmx: cset.cmx syntax.cmi
+table.cmo: table.cmi
+table.cmx: table.cmi
diff -Nru jocaml-3.12.0/lex/outputbis.ml jocaml-3.12.1/lex/outputbis.ml
--- jocaml-3.12.0/lex/outputbis.ml	2010-06-04 19:15:07.000000000 +0000
+++ jocaml-3.12.1/lex/outputbis.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: outputbis.ml 10502 2010-06-04 19:15:07Z maranget $ *)
+(* $Id: outputbis.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Output the DFA tables and its entry points *)
 
@@ -20,31 +20,31 @@
 open Common
 
 let output_auto_defs oc =
-  fprintf oc "let __ocaml_lex_init_lexbuf lexbuf mem_size =\n\
-  let pos = lexbuf.Lexing.lex_curr_pos in\n\
-  lexbuf.Lexing.lex_mem <- Array.create mem_size (-1) ;\n\
-  lexbuf.Lexing.lex_start_pos <- pos ;\n\
-  lexbuf.Lexing.lex_last_pos <- pos ;\n\
-  lexbuf.Lexing.lex_last_action <- -1\n\
-\n\
+  fprintf oc "let __ocaml_lex_init_lexbuf lexbuf mem_size =\
+\n  let pos = lexbuf.Lexing.lex_curr_pos in\
+\n  lexbuf.Lexing.lex_mem <- Array.create mem_size (-1) ;\
+\n  lexbuf.Lexing.lex_start_pos <- pos ;\
+\n  lexbuf.Lexing.lex_last_pos <- pos ;\
+\n  lexbuf.Lexing.lex_last_action <- -1\
+\n\n\
 " ;
 
   output_string oc
-    "let rec __ocaml_lex_next_char lexbuf =\n\
-  if lexbuf.Lexing.lex_curr_pos >= lexbuf.Lexing.lex_buffer_len then begin\n\
-    if lexbuf.Lexing.lex_eof_reached then\n\
-      256\n\
-    else begin\n\
-      lexbuf.Lexing.refill_buff lexbuf ;\n\
-      __ocaml_lex_next_char lexbuf\n\
-    end\n\
-  end else begin\n\
-    let i = lexbuf.Lexing.lex_curr_pos in\n\
-    let c = lexbuf.Lexing.lex_buffer.[i] in\n\
-    lexbuf.Lexing.lex_curr_pos <- i+1 ;\n\
-    Char.code c\n\
-  end\n\
-\n\
+    "let rec __ocaml_lex_next_char lexbuf =\
+\n  if lexbuf.Lexing.lex_curr_pos >= lexbuf.Lexing.lex_buffer_len then begin\
+\n    if lexbuf.Lexing.lex_eof_reached then\
+\n      256\
+\n    else begin\
+\n      lexbuf.Lexing.refill_buff lexbuf ;\
+\n      __ocaml_lex_next_char lexbuf\
+\n    end\
+\n  end else begin\
+\n    let i = lexbuf.Lexing.lex_curr_pos in\
+\n    let c = lexbuf.Lexing.lex_buffer.[i] in\
+\n    lexbuf.Lexing.lex_curr_pos <- i+1 ;\
+\n    Char.code c\
+\n  end\
+\n\n\
 "
 
 
@@ -155,13 +155,13 @@
 
 let output_entry sourcefile ic oc tr e =
   let init_num, init_moves = e.auto_initial_state in
-  fprintf oc "%s %alexbuf =\n\
-  __ocaml_lex_init_lexbuf lexbuf %d; %a\n\
-  let __ocaml_lex_result = __ocaml_lex_state%d lexbuf in\n\
-  lexbuf.Lexing.lex_start_p <- lexbuf.Lexing.lex_curr_p;\n\
-  lexbuf.Lexing.lex_curr_p <- {lexbuf.Lexing.lex_curr_p with\n\
-    Lexing.pos_cnum = lexbuf.Lexing.lex_abs_pos + lexbuf.Lexing.lex_curr_pos};\n\
-  match __ocaml_lex_result with\n"
+  fprintf oc "%s %alexbuf =\
+\n  __ocaml_lex_init_lexbuf lexbuf %d; %a\
+\n  let __ocaml_lex_result = __ocaml_lex_state%d lexbuf in\
+\n  lexbuf.Lexing.lex_start_p <- lexbuf.Lexing.lex_curr_p;\
+\n  lexbuf.Lexing.lex_curr_p <- {lexbuf.Lexing.lex_curr_p with\
+\n    Lexing.pos_cnum = lexbuf.Lexing.lex_abs_pos + lexbuf.Lexing.lex_curr_pos};\
+\n  match __ocaml_lex_result with\n"
       e.auto_name output_args e.auto_args
       e.auto_mem_size (output_memory_actions "  ") init_moves init_num ;
   List.iter
diff -Nru jocaml-3.12.0/lex/output.ml jocaml-3.12.1/lex/output.ml
--- jocaml-3.12.0/lex/output.ml	2010-06-04 19:15:07.000000000 +0000
+++ jocaml-3.12.1/lex/output.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: output.ml 10502 2010-06-04 19:15:07Z maranget $ *)
+(* $Id: output.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Output the DFA tables and its entry points *)
 
@@ -74,8 +74,8 @@
 
 let output_entry sourcefile ic oc oci e =
   let init_num, init_moves = e.auto_initial_state in
-  fprintf oc "%s %alexbuf =\n\
-  %a%a  __ocaml_lex_%s_rec %alexbuf %d\n"
+  fprintf oc "%s %alexbuf =\
+\n  %a%a  __ocaml_lex_%s_rec %alexbuf %d\n"
     e.auto_name
     output_args  e.auto_args
     (fun oc x ->
diff -Nru jocaml-3.12.0/LICENSE jocaml-3.12.1/LICENSE
--- jocaml-3.12.0/LICENSE	2007-03-23 09:01:11.000000000 +0000
+++ jocaml-3.12.1/LICENSE	2011-07-07 14:32:00.000000000 +0000
@@ -6,8 +6,9 @@
 and "the Compiler" refers to all files marked "Copyright INRIA" in the
 following directories and their sub-directories:
 
-  asmcomp, boot, bytecomp, debugger, driver, lex, ocamldoc, parsing,
-  tools, toplevel, typing, utils, yacc
+  asmcomp, boot, build, bytecomp, debugger, driver, lex, man,
+  ocamlbuild, ocamldoc, parsing, testsuite, tools, toplevel, typing,
+  utils, yacc
 
 The Compiler is distributed under the terms of the Q Public License
 version 1.0 with a change to choice of law (included below).
diff -Nru jocaml-3.12.0/Makefile jocaml-3.12.1/Makefile
--- jocaml-3.12.0/Makefile	2010-06-29 13:52:11.000000000 +0000
+++ jocaml-3.12.1/Makefile	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 #                                                                       #
 #########################################################################
 
-# $Id: Makefile 10611 2010-06-29 13:52:11Z maranget $
+# $Id: Makefile 11113 2011-07-07 14:32:00Z maranget $
 
 # The main Makefile
 
@@ -273,7 +273,6 @@
 	 ocamlbuild.byte camlp4out $(DEBUGGER) ocamldoc ocamlopt.opt \
 	 otherlibrariesopt
 
-
 # Installation
 install:
 	if test -d $(BINDIR); then : ; else $(MKDIR) $(BINDIR); fi
diff -Nru jocaml-3.12.0/man/ocamldep.m jocaml-3.12.1/man/ocamldep.m
--- jocaml-3.12.0/man/ocamldep.m	2010-06-04 19:20:03.000000000 +0000
+++ jocaml-3.12.1/man/ocamldep.m	2011-07-07 14:32:00.000000000 +0000
@@ -1,18 +1,20 @@
+\" $Id: ocamldep.m 11113 2011-07-07 14:32:00Z maranget $
+
 .TH OCAMLDEP 1
 
 .SH NAME
 ocamldep \- Dependency generator for Objective Caml
 
 .SH SYNOPSIS
-.B ocamldep 
+.B ocamldep
 [
-.BI \-I \ lib-dir
+.I options
 ]
 .I filename ...
 
 .SH DESCRIPTION
 
-The 
+The
 .BR ocamldep (1)
 command scans a set of Objective Caml source files
 (.ml and .mli files) for references to external compilation units,
@@ -24,7 +26,7 @@
 
 The typical usage is:
 .P
-ocamldep 
+ocamldep
 .I options
 *.mli *.ml > .depend
 .P
@@ -32,30 +34,51 @@
 dependencies.
 
 Dependencies are generated both for compiling with the bytecode
-compiler 
+compiler
 .BR ocamlc (1)
-and with the native-code compiler 
+and with the native-code compiler
 .BR ocamlopt (1).
 
 .SH OPTIONS
 
-The following command-line option is recognized by 
+The following command-line options are recognized by
 .BR ocamldep (1).
-
 .TP
 .BI \-I \ 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 
-.BR -I .
-Otherwise, Bar is assumed to be a module form the standard library,
+current directory or in one of the directories specified with
+.BR \-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 
+directories, it is recommended to pass
 .BR ocamldep (1)
-the same -I options that are passed to the compiler.
-
+the same
+.B \-I
+options that are passed to the compiler.
+.TP
+.BI \-ml\-synonym \ .ext
+Consider the given extension (with leading dot) to be a synonym for .ml.
+.TP
+.BI \-mli\-synonym \ .ext
+Consider the given extension (with leading dot) to be a synonym for .mli.
+.TP
+.B \-modules
+Output raw dependencies of the form
+.IR filename : \ Module1\ Module2 \ ... \ ModuleN
+where
+.IR Module1 ,\ ..., \ ModuleN
+are the names of the compilation
+units referenced within the file
+.IR filename ,
+but these names are not
+resolved to source file names.  Such raw dependencies cannot be used
+by
+.BR make (1),
+but can be post-processed by other tools such as
+.BR Omake (1).
 .TP
 .BI \-native
 Generate dependencies for a pure native-code program (no bytecode
@@ -66,12 +89,10 @@
 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
-.BR -native
+.B \-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.)
-<<<<<<< .courant
-=======
 .TP
 .BI \-pp \ command
 Cause
@@ -91,11 +112,10 @@
 .TP
 .BR \-help \ or \ \-\-help
 Display a short usage summary and exit.
->>>>>>> .fusion-droit.r10497
 
 .SH SEE ALSO
 .BR ocamlc (1),
 .BR ocamlopt (1).
 .br
-.I The Objective Caml user's manual,
+.IR The\ Objective\ Caml\ user's\ manual ,
 chapter "Dependency generator".
diff -Nru jocaml-3.12.0/otherlibs/bigarray/bigarray_stubs.c jocaml-3.12.1/otherlibs/bigarray/bigarray_stubs.c
--- jocaml-3.12.0/otherlibs/bigarray/bigarray_stubs.c	2010-06-04 19:17:18.000000000 +0000
+++ jocaml-3.12.1/otherlibs/bigarray/bigarray_stubs.c	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: bigarray_stubs.c 10509 2010-06-04 19:17:18Z maranget $ */
+/* $Id: bigarray_stubs.c 11113 2011-07-07 14:32:00Z maranget $ */
 
 #include <stddef.h>
 #include <stdarg.h>
@@ -529,8 +529,13 @@
   struct caml_bigarray * b1 = Bigarray_val(v1);
   struct caml_bigarray * b2 = Bigarray_val(v2);
   uintnat n, num_elts;
+  intnat flags1, flags2;
   int i;
 
+  /* Compare kind & layout in case the arguments are of different types */
+  flags1 = b1->flags & (CAML_BA_KIND_MASK | CAML_BA_LAYOUT_MASK);
+  flags2 = b2->flags & (CAML_BA_KIND_MASK | CAML_BA_LAYOUT_MASK);
+  if (flags1 != flags2) return flags2 - flags1;
   /* Compare number of dimensions */
   if (b1->num_dims != b2->num_dims) return b2->num_dims - b1->num_dims;
   /* Same number of dimensions: compare dimensions lexicographically */
diff -Nru jocaml-3.12.0/otherlibs/bigarray/mmap_unix.c jocaml-3.12.1/otherlibs/bigarray/mmap_unix.c
--- jocaml-3.12.0/otherlibs/bigarray/mmap_unix.c	2010-06-04 19:17:18.000000000 +0000
+++ jocaml-3.12.1/otherlibs/bigarray/mmap_unix.c	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: mmap_unix.c 10509 2010-06-04 19:17:18Z maranget $ */
+/* $Id: mmap_unix.c 11113 2011-07-07 14:32:00Z maranget $ */
 
 #include <stddef.h>
 #include <string.h>
@@ -21,6 +21,7 @@
 #include "io.h"
 #include "mlvalues.h"
 #include "sys.h"
+#include "signals.h"
 
 extern int caml_ba_element_size[];  /* from bigarray_stubs.c */
 
@@ -146,7 +147,7 @@
 value caml_ba_map_file(value vfd, value vkind, value vlayout,
                        value vshared, value vdim, value vpos)
 {
-  invalid_argument("Bigarray.map_file: not supported");
+  caml_invalid_argument("Bigarray.map_file: not supported");
   return Val_unit;
 }
 
diff -Nru jocaml-3.12.0/otherlibs/bigarray/mmap_win32.c jocaml-3.12.1/otherlibs/bigarray/mmap_win32.c
--- jocaml-3.12.0/otherlibs/bigarray/mmap_win32.c	2010-06-04 19:17:18.000000000 +0000
+++ jocaml-3.12.1/otherlibs/bigarray/mmap_win32.c	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: mmap_win32.c 10509 2010-06-04 19:17:18Z maranget $ */
+/* $Id: mmap_win32.c 11113 2011-07-07 14:32:00Z maranget $ */
 
 #include <stddef.h>
 #include <stdio.h>
@@ -108,7 +108,7 @@
   if (fmap == NULL) caml_ba_sys_error();
   /* Determine offset so that the mapping starts at the given file pos */
   GetSystemInfo(&sysinfo);
-  delta = (uintnat) (startpos % sysinfo.dwPageSize);
+  delta = (uintnat) (startpos % sysinfo.dwAllocationGranularity);
   /* Map the mapping in memory */
   li.QuadPart = startpos - delta;
   addr =
@@ -133,7 +133,7 @@
   uintnat delta;
 
   GetSystemInfo(&sysinfo);
-  delta = (uintnat) addr % sysinfo.dwPageSize;
+  delta = (uintnat) addr % sysinfo.dwAllocationGranularity;
   UnmapViewOfFile((void *)((uintnat)addr - delta));
 }
 
diff -Nru jocaml-3.12.0/otherlibs/db/.depend jocaml-3.12.1/otherlibs/db/.depend
--- jocaml-3.12.0/otherlibs/db/.depend	2010-06-04 19:17:18.000000000 +0000
+++ jocaml-3.12.1/otherlibs/db/.depend	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-db.cmo: db.cmi
-db.cmx: db.cmi
diff -Nru jocaml-3.12.0/otherlibs/graph/.depend jocaml-3.12.1/otherlibs/graph/.depend
--- jocaml-3.12.0/otherlibs/graph/.depend	2010-06-04 19:17:18.000000000 +0000
+++ jocaml-3.12.1/otherlibs/graph/.depend	2011-07-07 14:32:00.000000000 +0000
@@ -1,63 +1,63 @@
 color.o: color.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h
 draw.o: draw.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h
 dump_img.o: dump_img.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h image.h ../../byterun/alloc.h \
-  ../../byterun/mlvalues.h ../../byterun/memory.h ../../byterun/gc.h \
-  ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h image.h ../../byterun/alloc.h \
+ ../../byterun/mlvalues.h ../../byterun/memory.h ../../byterun/gc.h \
+ ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h
 events.o: events.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  ../../byterun/signals.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ ../../byterun/signals.h
 fill.o: fill.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/memory.h ../../byterun/gc.h \
-  ../../byterun/mlvalues.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/memory.h ../../byterun/gc.h \
+ ../../byterun/mlvalues.h ../../byterun/major_gc.h \
+ ../../byterun/freelist.h ../../byterun/minor_gc.h
 image.o: image.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h image.h ../../byterun/alloc.h \
-  ../../byterun/mlvalues.h ../../byterun/custom.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h image.h ../../byterun/alloc.h \
+ ../../byterun/mlvalues.h ../../byterun/custom.h
 make_img.o: make_img.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h image.h ../../byterun/memory.h ../../byterun/gc.h \
-  ../../byterun/mlvalues.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h image.h ../../byterun/memory.h ../../byterun/gc.h \
+ ../../byterun/mlvalues.h ../../byterun/major_gc.h \
+ ../../byterun/freelist.h ../../byterun/minor_gc.h
 open.o: open.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  ../../byterun/callback.h ../../byterun/fail.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ ../../byterun/callback.h ../../byterun/fail.h ../../byterun/memory.h \
+ ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h
 point_col.o: point_col.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h
 sound.o: sound.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h
 subwindow.o: subwindow.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h
 text.o: text.c libgraph.h ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h
 graphics.cmi:
 graphicsX11.cmi:
 graphics.cmo: graphics.cmi
diff -Nru jocaml-3.12.0/otherlibs/join/.depend jocaml-3.12.1/otherlibs/join/.depend
--- jocaml-3.12.0/otherlibs/join/.depend	2010-09-06 13:32:53.000000000 +0000
+++ jocaml-3.12.1/otherlibs/join/.depend	2011-07-07 14:32:00.000000000 +0000
@@ -1,12 +1,14 @@
+join.cmi:
 joinCom.cmi: join.cmi
 joinCount.cmi: join.cmi
 joinFifo.cmi: joinCom.cmi join.cmi
 joinHelper.cmi: join.cmi
 joinMapRed.cmi: joinPool.cmi joinHelper.cmi
-join.cmi:
 joinPool.cmi: join.cmi
 joinProc.cmi:
 joinTextProc.cmi: joinCom.cmi join.cmi
+join.cmo: site.cmo ns.cmo join.cmi
+join.cmx: site.cmx ns.cmx join.cmi
 joinCom.cmo: join.cmi joinCom.cmi
 joinCom.cmx: join.cmx joinCom.cmi
 joinCount.cmo: join.cmi joinCount.cmi
@@ -17,8 +19,6 @@
 joinHelper.cmx: join.cmx joinHelper.cmi
 joinMapRed.cmo: joinPool.cmi joinHelper.cmi join.cmi joinMapRed.cmi
 joinMapRed.cmx: joinPool.cmx joinHelper.cmx join.cmx joinMapRed.cmi
-join.cmo: site.cmo ns.cmo join.cmi
-join.cmx: site.cmx ns.cmx join.cmi
 joinPool.cmo: joinCount.cmi join.cmi joinPool.cmi
 joinPool.cmx: joinCount.cmx join.cmx joinPool.cmi
 joinProc.cmo: joinProc.cmi
diff -Nru jocaml-3.12.0/otherlibs/join/joinCom.ml jocaml-3.12.1/otherlibs/join/joinCom.ml
--- jocaml-3.12.0/otherlibs/join/joinCom.ml	2010-06-29 09:38:42.000000000 +0000
+++ jocaml-3.12.1/otherlibs/join/joinCom.ml	2011-02-18 09:21:22.000000000 +0000
@@ -95,7 +95,7 @@
       let x =
         try  read_line chan
         with Sys_error msg ->
-          Join.debug "PROD" "Sys_error in read_line: \"%s\"" msg ;
+          debug "PROD" "Sys_error in read_line: \"%s\"" msg ;
           None in
       begin match x with None -> safe_close_in chan | Some _ -> () end ;
       k(x)
diff -Nru jocaml-3.12.0/otherlibs/join/joinCount.ml jocaml-3.12.1/otherlibs/join/joinCount.ml
--- jocaml-3.12.0/otherlibs/join/joinCount.ml	2009-10-30 11:36:49.000000000 +0000
+++ jocaml-3.12.1/otherlibs/join/joinCount.ml	2011-01-28 16:06:24.000000000 +0000
@@ -11,7 +11,7 @@
 end
 
 module Down = struct
-  type ('a,'b) t =
+  type t =
       { tick : unit Join.chan ;
       wait : unit -> unit ; }
 
diff -Nru jocaml-3.12.0/otherlibs/join/joinCount.mli jocaml-3.12.1/otherlibs/join/joinCount.mli
--- jocaml-3.12.0/otherlibs/join/joinCount.mli	2009-10-30 11:36:49.000000000 +0000
+++ jocaml-3.12.1/otherlibs/join/joinCount.mli	2011-01-28 16:06:24.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: joinCount.mli 9400 2009-10-30 11:36:49Z xclerc $ *)
+(* $Id: joinCount.mli 10933 2011-01-28 16:06:24Z maranget $ *)
 
 (** Counting {i n} asynchronous events
 
@@ -30,9 +30,9 @@
 (** Simple countdowns. *)
 module Down :
   sig
-    type ('a, 'b) t = { tick : unit Join.chan; wait : unit -> unit; }
+    type t = { tick : unit Join.chan; wait : unit -> unit; }
 
-    val create : int -> ('a, 'b) t
+    val create : int -> t
     (** [create n] returns a countdown [c] for [n] events.
         That is, after [n] messages on [c.tick], the call
 	[c.wait()] will return.
diff -Nru jocaml-3.12.0/otherlibs/join/joinPool.ml jocaml-3.12.1/otherlibs/join/joinPool.ml
--- jocaml-3.12.0/otherlibs/join/joinPool.ml	2010-06-11 16:55:47.000000000 +0000
+++ jocaml-3.12.1/otherlibs/join/joinPool.ml	2011-02-23 16:15:27.000000000 +0000
@@ -309,13 +309,14 @@
         | [] ->
             agent(worker) &
 	    if n <> 0 then begin
+              if C.debug then Join.debug "POOL" "N=%i" n ;
 	      let again = m.get_active () in
 	      match again with
               | [] ->
                   pool(E,low)
               | _  ->
                   let n = if n = min_int then min_int else n-1 in
-                  pool(E,put (again,n-1,m) low)
+                  pool(E,put (again,n,m) low)
             end else begin
               pool(E,low)
             end
diff -Nru jocaml-3.12.0/otherlibs/join/joinTextProc.ml jocaml-3.12.1/otherlibs/join/joinTextProc.ml
--- jocaml-3.12.0/otherlibs/join/joinTextProc.ml	2010-06-29 15:47:12.000000000 +0000
+++ jocaml-3.12.1/otherlibs/join/joinTextProc.ml	2011-07-07 14:32:00.000000000 +0000
@@ -43,14 +43,17 @@
       { out : producer ;
         err : producer ;
         waitpid : Unix.process_status Join.chan Join.chan ;
-        kill : int -> unit;  }
+        kill : int -> unit;
+        gkill : int -> unit; }
 
 
   let et =
     let ep = JoinCom.P.empty() in
     { out=ep; err=ep;
       waitpid=(def k(_) = 0 in k);
-      kill=(fun _ -> ()); }
+      kill=(fun _ -> ());
+      gkill=(fun _ -> ());
+    }
 
       
   def producer_to_chan (prod,chan) = JoinCom.P.to_text_close (prod,chan)
@@ -68,6 +71,7 @@
     spawn waited(safe_wait pid) ;
     { r with
       kill=async_kill pid prods chans;
+      gkill=async_kill (-pid) prods chans;
       waitpid=waitpid; }      
 
   let of_text chan = JoinCom.P.of_text chan
@@ -124,7 +128,8 @@
     
   type t =
       { wait : unit  -> result;
-        kill : int -> unit; }
+        kill : int -> unit;
+        gkill : int -> unit; }
 
 
   module P = JoinCom.P
@@ -148,7 +153,7 @@
     def wait_ter() & waitpid(st) =
       reply { er with st=st; } to wait_ter in
     let () = spawn ext.Async.waitpid(waitpid) in
-    { wait=wait_ter; kill=ext.Async.kill; }
+    { wait=wait_ter; kill=ext.Async.kill; gkill=ext.Async.gkill; }
 
   let open_in cmd argv =
     let ext = Async.open_in cmd argv in
@@ -158,7 +163,7 @@
       consume(ext.Async.out,verb "OUT" out) &
       ext.Async.waitpid(waitpid)
     end in
-    { wait=wait_ter; kill=ext.Async.kill; }
+    { wait=wait_ter; kill=ext.Async.kill; gkill=ext.Async.gkill; }
 
 
   let open_in_out cmd argv =
@@ -169,7 +174,8 @@
         reply { er with st=st; out=os; } to wait_ter in
       consume(ext.Async.out,verb "OUT" out) &
       ext.Async.waitpid(waitpid) &
-      reply { wait=wait_ter; kill=ext.Async.kill; } to fork in
+      reply { wait=wait_ter; kill=ext.Async.kill; gkill=ext.Async.gkill;}
+       to fork in
     fork
 
 
@@ -182,6 +188,7 @@
       consume(ext.Async.out,verb "OUT" out) &
       consume(ext.Async.err,verb "ERR" err) &
       ext.Async.waitpid(waitpid) &
-      reply { wait=wait_ter; kill=ext.Async.kill; } to fork in
+      reply { wait=wait_ter; kill=ext.Async.kill; gkill=ext.Async.gkill; }
+      to fork in
     fork
 end
diff -Nru jocaml-3.12.0/otherlibs/join/joinTextProc.mli jocaml-3.12.1/otherlibs/join/joinTextProc.mli
--- jocaml-3.12.0/otherlibs/join/joinTextProc.mli	2010-06-29 15:47:12.000000000 +0000
+++ jocaml-3.12.1/otherlibs/join/joinTextProc.mli	2011-07-07 14:32:00.000000000 +0000
@@ -32,6 +32,7 @@
         err : producer ; (** Connected to child process standard error *)
         waitpid : Unix.process_status Join.chan Join.chan ; (** Invoke continuation argument when child process changes status. *)
         kill : int -> unit; (** Send (Unix) signal to child process *)
+        gkill : int -> unit  (** Send (Unix) signal to child process group *)
       }
 (** Notice that [out] or [err] above can be empty producers when
     child process channels redirection is not commanded. *)
@@ -84,7 +85,8 @@
 
   type t = (** Abstraction of forked command *)
       { wait : unit  -> result; (** Get result (will block) *)
-        kill : int -> unit;    (** Kill child *)
+        kill : int -> unit;     (** Kill child *)
+        gkill : int -> unit;     (** Kill child group *)
       }
   val command : string -> string array ->  t
     (** Analogous of {!JoinProc.command}.
diff -Nru jocaml-3.12.0/otherlibs/join/site.ml jocaml-3.12.1/otherlibs/join/site.ml
--- jocaml-3.12.0/otherlibs/join/site.ml	2010-06-04 07:48:53.000000000 +0000
+++ jocaml-3.12.1/otherlibs/join/site.ml	2011-01-28 16:06:24.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: site.ml 10494 2010-06-04 07:48:53Z maranget $ *)
+(* $Id: site.ml 10933 2011-01-28 16:06:24Z maranget $ *)
 
 open Join_types
 (*DEBUG*)open Join_debug
@@ -48,7 +48,9 @@
 let where_from ( chan : 'a async ) = (Obj.magic chan : t)
 
 let equal s1 s2 = 
-  (Join_prim.space_id_of_chan s1) = (Join_prim.space_id_of_chan s2)
+  let id1 = Join_prim.space_id_of_chan s1
+  and id2 = Join_prim.space_id_of_chan s2 in
+  id1 = id2
 
 and compare s1 s2 =
   Pervasives.compare
diff -Nru jocaml-3.12.0/otherlibs/labltk/browser/shell.ml jocaml-3.12.1/otherlibs/labltk/browser/shell.ml
--- jocaml-3.12.0/otherlibs/labltk/browser/shell.ml	2004-05-27 09:18:38.000000000 +0000
+++ jocaml-3.12.1/otherlibs/labltk/browser/shell.ml	2011-07-07 14:32:00.000000000 +0000
@@ -12,7 +12,7 @@
 (*                                                                       *)
 (*************************************************************************)
 
-(* $Id: shell.ml 6336 2004-05-27 09:18:38Z maranget $ *)
+(* $Id: shell.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 open StdLabels
 module Unix = UnixLabels
@@ -254,7 +254,7 @@
 
 let path_sep = if is_win32 then ";" else ":"
 
-let warnings = ref "Al"
+let warnings = ref Warnings.defaults_w
 
 let program_not_found prog =
   Jg_message.info ~title:"Error"
diff -Nru jocaml-3.12.0/otherlibs/num/big_int.ml jocaml-3.12.1/otherlibs/num/big_int.ml
--- jocaml-3.12.0/otherlibs/num/big_int.ml	2010-06-04 19:17:18.000000000 +0000
+++ jocaml-3.12.1/otherlibs/num/big_int.ml	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: big_int.ml 10509 2010-06-04 19:17:18Z maranget $ *)
+(* $Id: big_int.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 open Int_misc
 open Nat
@@ -701,7 +701,9 @@
         let tmp = create_nat 1 in
         shift_right_nat res 0 size_res tmp 0 nbits
       end;
-      { sign = bi.sign; abs_value = res }
+      if is_zero_nat res 0 size_res
+      then zero_big_int
+      else { sign = bi.sign; abs_value = res }
     end
   end
 
diff -Nru jocaml-3.12.0/otherlibs/num/.depend jocaml-3.12.1/otherlibs/num/.depend
--- jocaml-3.12.0/otherlibs/num/.depend	2010-09-06 13:32:53.000000000 +0000
+++ jocaml-3.12.1/otherlibs/num/.depend	2011-07-07 14:32:00.000000000 +0000
@@ -0,0 +1,40 @@
+bng.o: bng.c bng.h ../../byterun/config.h ../../byterun/../config/m.h \
+  ../../byterun/../config/s.h ../../byterun/compatibility.h bng_amd64.c \
+  bng_digit.c
+bng_alpha.o: bng_alpha.c
+bng_amd64.o: bng_amd64.c
+bng_digit.o: bng_digit.c
+bng_ia32.o: bng_ia32.c
+bng_mips.o: bng_mips.c
+bng_ppc.o: bng_ppc.c
+bng_sparc.o: bng_sparc.c
+nat_stubs.o: nat_stubs.c ../../byterun/alloc.h \
+  ../../byterun/compatibility.h ../../byterun/misc.h \
+  ../../byterun/config.h ../../byterun/../config/m.h \
+  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+  ../../byterun/config.h ../../byterun/custom.h ../../byterun/intext.h \
+  ../../byterun/io.h ../../byterun/fix_code.h ../../byterun/fail.h \
+  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
+  ../../byterun/freelist.h ../../byterun/minor_gc.h \
+  ../../byterun/mlvalues.h bng.h nat.h
+arith_flags.cmi:
+arith_status.cmi:
+big_int.cmi: nat.cmi
+int_misc.cmi:
+nat.cmi:
+num.cmi: ratio.cmi nat.cmi big_int.cmi
+ratio.cmi: nat.cmi big_int.cmi
+arith_flags.cmo: arith_flags.cmi
+arith_flags.cmx: arith_flags.cmi
+arith_status.cmo: arith_flags.cmi arith_status.cmi
+arith_status.cmx: arith_flags.cmx arith_status.cmi
+big_int.cmo: nat.cmi int_misc.cmi big_int.cmi
+big_int.cmx: nat.cmx int_misc.cmx big_int.cmi
+int_misc.cmo: int_misc.cmi
+int_misc.cmx: int_misc.cmi
+nat.cmo: int_misc.cmi nat.cmi
+nat.cmx: int_misc.cmx nat.cmi
+num.cmo: ratio.cmi nat.cmi int_misc.cmi big_int.cmi arith_flags.cmi num.cmi
+num.cmx: ratio.cmx nat.cmx int_misc.cmx big_int.cmx arith_flags.cmx num.cmi
+ratio.cmo: nat.cmi int_misc.cmi big_int.cmi arith_flags.cmi ratio.cmi
+ratio.cmx: nat.cmx int_misc.cmx big_int.cmx arith_flags.cmx ratio.cmi
diff -Nru jocaml-3.12.0/otherlibs/remove_DEBUG jocaml-3.12.1/otherlibs/remove_DEBUG
--- jocaml-3.12.0/otherlibs/remove_DEBUG	2010-09-06 16:23:13.000000000 +0000
+++ jocaml-3.12.1/otherlibs/remove_DEBUG	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-#(***********************************************************************)
-#(*                            OCamldoc                                 *)
-#(*                                                                     *)
-#(*            Damien Doligez, projet Moscova, INRIA Rocquencourt       *)
-#(*                                                                     *)
-#(*  Copyright 2003 Institut National de Recherche en Informatique et   *)
-#(*  en Automatique.  All rights reserved.  This file is distributed    *)
-#(*  under the terms of the Q Public License version 1.0.               *)
-#(*                                                                     *)
-#(***********************************************************************)
-
-# $Id: remove_DEBUG 10519 2010-06-04 19:19:34Z maranget $
-
-# usage: remove_DEBUG <file>
-# remove from <file> every line that contains the string "DEBUG",
-# respecting the cpp # line annotation conventions
-
-echo "# 1 \"$1\""
-LC_ALL=C sed -e '/DEBUG/c\
-(* DEBUG statement removed *)' "$1"
diff -Nru jocaml-3.12.0/otherlibs/systhreads/.depend jocaml-3.12.1/otherlibs/systhreads/.depend
--- jocaml-3.12.0/otherlibs/systhreads/.depend	2010-06-04 19:17:18.000000000 +0000
+++ jocaml-3.12.1/otherlibs/systhreads/.depend	2011-07-07 14:32:00.000000000 +0000
@@ -1,22 +1,22 @@
 join.o: join.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/mlvalues.h ../../byterun/memory.h ../../byterun/gc.h \
-  ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h ../../byterun/roots.h ../../byterun/memory.h \
-  ../../byterun/custom.h ../../byterun/intext.h ../../byterun/io.h \
-  ../../byterun/fix_code.h ../../byterun/fail.h ../../byterun/misc.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
+ ../../byterun/mlvalues.h ../../byterun/memory.h ../../byterun/gc.h \
+ ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h ../../byterun/roots.h ../../byterun/memory.h \
+ ../../byterun/custom.h ../../byterun/intext.h ../../byterun/io.h \
+ ../../byterun/fix_code.h ../../byterun/fail.h ../../byterun/misc.h
 st_stubs.o: st_stubs.c ../../byterun/alloc.h \
-  ../../byterun/compatibility.h ../../byterun/misc.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/backtrace.h ../../byterun/callback.h \
-  ../../byterun/custom.h ../../byterun/fail.h ../../byterun/io.h \
-  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h ../../byterun/misc.h \
-  ../../byterun/mlvalues.h ../../byterun/printexc.h ../../byterun/roots.h \
-  ../../byterun/memory.h ../../byterun/signals.h ../../byterun/stacks.h \
-  ../../byterun/sys.h threads.h st_posix.h
+ ../../byterun/compatibility.h ../../byterun/misc.h \
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/backtrace.h ../../byterun/callback.h \
+ ../../byterun/custom.h ../../byterun/fail.h ../../byterun/io.h \
+ ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
+ ../../byterun/freelist.h ../../byterun/minor_gc.h ../../byterun/misc.h \
+ ../../byterun/mlvalues.h ../../byterun/printexc.h ../../byterun/roots.h \
+ ../../byterun/memory.h ../../byterun/signals.h ../../byterun/stacks.h \
+ ../../byterun/sys.h threads.h st_posix.h
 condition.cmi: mutex.cmi
 event.cmi:
 join_debug.cmi:
diff -Nru jocaml-3.12.0/otherlibs/systhreads/Makefile jocaml-3.12.1/otherlibs/systhreads/Makefile
--- jocaml-3.12.0/otherlibs/systhreads/Makefile	2010-09-06 16:23:13.000000000 +0000
+++ jocaml-3.12.1/otherlibs/systhreads/Makefile	2011-07-08 09:23:38.000000000 +0000
@@ -11,7 +11,7 @@
 #                                                                       #
 #########################################################################
 
-# $Id: Makefile 10672 2010-09-06 16:23:13Z maranget $
+# $Id: Makefile 11118 2011-07-08 09:23:38Z maranget $
 
 include ../../config/Makefile
 NOJOIN=-nojoin
@@ -21,7 +21,7 @@
 JCOPT=../../ocamlcompopt.sh -I ../unix
 MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
 COMPFLAGS=-warn-error A -g
-OCAMLPP=-pp '../remove_DEBUG'
+OCAMLPP=-pp '../../tools/remove_DEBUG'
 
 
 BYTECODE_JOIN_C_OBJS=join_b.o
diff -Nru jocaml-3.12.0/otherlibs/systhreads/st_stubs.c jocaml-3.12.1/otherlibs/systhreads/st_stubs.c
--- jocaml-3.12.0/otherlibs/systhreads/st_stubs.c	2010-06-04 19:17:18.000000000 +0000
+++ jocaml-3.12.1/otherlibs/systhreads/st_stubs.c	2011-07-07 14:32:00.000000000 +0000
@@ -451,6 +451,11 @@
 
 static void caml_thread_stop(void)
 {
+#ifndef NATIVE_CODE
+  /* PR#5188: update curr_thread->stack_low because the stack may have
+     been reallocated since the last time we entered a blocking section */
+  curr_thread->stack_low = stack_low;
+#endif
   /* Signal that the thread has terminated */
   caml_threadstatus_terminate(Terminated(curr_thread->descr));
   /* Remove th from the doubly-linked list of threads and free its info block */
diff -Nru jocaml-3.12.0/otherlibs/systhreads/thread.ml jocaml-3.12.1/otherlibs/systhreads/thread.ml
--- jocaml-3.12.0/otherlibs/systhreads/thread.ml	2010-06-04 19:17:18.000000000 +0000
+++ jocaml-3.12.1/otherlibs/systhreads/thread.ml	2011-07-07 14:32:00.000000000 +0000
@@ -18,6 +18,7 @@
 type t
 
 external thread_initialize : unit -> unit = "caml_thread_initialize"
+external thread_cleanup : unit -> unit = "caml_thread_cleanup"
 external thread_new : (unit -> unit) -> t = "caml_thread_new"
 external thread_uncaught_exception : exn -> unit =
             "caml_thread_uncaught_exception"
@@ -57,8 +58,17 @@
   | _       -> Sys.sigvtalrm
 
 let _ =
-  ignore(Sys.signal preempt_signal (Sys.Signal_handle preempt));
-  thread_initialize()
+  Sys.set_signal preempt_signal (Sys.Signal_handle preempt);
+  thread_initialize();
+  at_exit
+    (fun () ->
+        thread_cleanup();
+        (* In case of DLL-embedded Ocaml the preempt_signal handler
+           will point to nowhere after DLL unloading and an accidental
+           preempt_signal will crash the main program. So restore the
+           default handler. *)
+        Sys.set_signal preempt_signal Sys.Signal_default
+    )
 
 (* Wait functions *)
 
diff -Nru jocaml-3.12.0/otherlibs/threads/.depend jocaml-3.12.1/otherlibs/threads/.depend
--- jocaml-3.12.0/otherlibs/threads/.depend	2010-09-06 13:32:53.000000000 +0000
+++ jocaml-3.12.1/otherlibs/threads/.depend	2011-07-07 14:32:00.000000000 +0000
@@ -1,22 +1,22 @@
 join.o: join.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/mlvalues.h ../../byterun/memory.h ../../byterun/gc.h \
-  ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h ../../byterun/roots.h ../../byterun/memory.h \
-  ../../byterun/custom.h ../../byterun/intext.h ../../byterun/io.h \
-  ../../byterun/fix_code.h ../../byterun/fail.h ../../byterun/misc.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
+ ../../byterun/mlvalues.h ../../byterun/memory.h ../../byterun/gc.h \
+ ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h ../../byterun/roots.h ../../byterun/memory.h \
+ ../../byterun/custom.h ../../byterun/intext.h ../../byterun/io.h \
+ ../../byterun/fix_code.h ../../byterun/fail.h ../../byterun/misc.h
 scheduler.o: scheduler.c ../../byterun/alloc.h \
-  ../../byterun/compatibility.h ../../byterun/misc.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/backtrace.h ../../byterun/callback.h \
-  ../../byterun/config.h ../../byterun/fail.h ../../byterun/io.h \
-  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h ../../byterun/misc.h \
-  ../../byterun/mlvalues.h ../../byterun/printexc.h ../../byterun/roots.h \
-  ../../byterun/memory.h ../../byterun/signals.h ../../byterun/stacks.h \
-  ../../byterun/sys.h
+ ../../byterun/compatibility.h ../../byterun/misc.h \
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/backtrace.h ../../byterun/callback.h \
+ ../../byterun/config.h ../../byterun/fail.h ../../byterun/io.h \
+ ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
+ ../../byterun/freelist.h ../../byterun/minor_gc.h ../../byterun/misc.h \
+ ../../byterun/mlvalues.h ../../byterun/printexc.h ../../byterun/roots.h \
+ ../../byterun/memory.h ../../byterun/signals.h ../../byterun/stacks.h \
+ ../../byterun/sys.h
 condition.cmi: mutex.cmi
 event.cmi:
 join_debug.cmi:
diff -Nru jocaml-3.12.0/otherlibs/threads/join_prim.ml jocaml-3.12.1/otherlibs/threads/join_prim.ml
--- jocaml-3.12.0/otherlibs/threads/join_prim.ml	2007-06-01 07:46:53.000000000 +0000
+++ jocaml-3.12.1/otherlibs/threads/join_prim.ml	2011-01-28 16:06:24.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: join_prim.ml 8296 2007-06-01 07:46:53Z maranget $ *)
+(* $Id: join_prim.ml 10933 2011-01-28 16:06:24Z maranget $ *)
 
 open Join_types
 open Printf
@@ -301,9 +301,12 @@
 
 let space_id_of_chan chan =
   let stub = match chan with Async(stub,_)|Alone(stub,_) -> stub in
-  match stub.stub_tag with
-  | Local -> Join_space.here
-  | Remote -> (Obj.magic stub.stub_val : space_id)
+  let id =
+    match stub.stub_tag with
+    | Local -> Join_space.here
+    | Remote -> (Obj.magic stub.stub_val : space_id) in
+(*DEBUG*)debug0 "SPACE_ID" "%s-%i-%f" id.host (fst id.uniq) (snd id.uniq);
+  id
 
 (*********************)
 (* Synchronous sends *)
diff -Nru jocaml-3.12.0/otherlibs/threads/Makefile jocaml-3.12.1/otherlibs/threads/Makefile
--- jocaml-3.12.0/otherlibs/threads/Makefile	2010-09-06 16:23:13.000000000 +0000
+++ jocaml-3.12.1/otherlibs/threads/Makefile	2011-07-08 09:23:38.000000000 +0000
@@ -11,7 +11,7 @@
 #                                                                       #
 #########################################################################
 
-# $Id: Makefile 10672 2010-09-06 16:23:13Z maranget $
+# $Id: Makefile 11118 2011-07-08 09:23:38Z maranget $
 
 include ../../config/Makefile
 
@@ -22,7 +22,7 @@
 JCC=../../ocamlcomp.sh -I ../unix 
 MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
 COMPFLAGS=-warn-error A
-OCAMLPP=-pp '../remove_DEBUG'
+OCAMLPP=-pp '../../tools/remove_DEBUG'
 
 JOIN_C_OBJS=join.o
 
diff -Nru jocaml-3.12.0/otherlibs/unix/.depend jocaml-3.12.1/otherlibs/unix/.depend
--- jocaml-3.12.0/otherlibs/unix/.depend	2010-06-04 19:17:18.000000000 +0000
+++ jocaml-3.12.1/otherlibs/unix/.depend	2011-07-07 14:32:00.000000000 +0000
@@ -1,456 +1,453 @@
 accept.o: accept.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/mlvalues.h ../../byterun/fail.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h \
-  socketaddr.h ../../byterun/misc.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
+ ../../byterun/mlvalues.h ../../byterun/fail.h ../../byterun/memory.h \
+ ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h \
+ socketaddr.h ../../byterun/misc.h
 access.o: access.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/mlvalues.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
+ ../../byterun/mlvalues.h unixsupport.h
 addrofstr.o: addrofstr.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/fail.h ../../byterun/mlvalues.h \
-  unixsupport.h socketaddr.h ../../byterun/misc.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/fail.h ../../byterun/mlvalues.h \
+ unixsupport.h socketaddr.h ../../byterun/misc.h
 alarm.o: alarm.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 bind.o: bind.c ../../byterun/fail.h ../../byterun/compatibility.h \
-  ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/mlvalues.h unixsupport.h socketaddr.h \
-  ../../byterun/misc.h
+ ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/mlvalues.h unixsupport.h socketaddr.h ../../byterun/misc.h
 chdir.o: chdir.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 chmod.o: chmod.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 chown.o: chown.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 chroot.o: chroot.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 close.o: close.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 closedir.o: closedir.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h unixsupport.h
 connect.o: connect.c ../../byterun/fail.h ../../byterun/compatibility.h \
-  ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/mlvalues.h ../../byterun/signals.h unixsupport.h \
-  socketaddr.h ../../byterun/misc.h
+ ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/mlvalues.h ../../byterun/signals.h unixsupport.h \
+ socketaddr.h ../../byterun/misc.h
 cst2constr.o: cst2constr.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/fail.h ../../byterun/mlvalues.h \
-  cst2constr.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/fail.h ../../byterun/mlvalues.h \
+ cst2constr.h
 cstringv.o: cstringv.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/memory.h ../../byterun/gc.h \
-  ../../byterun/mlvalues.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h unixsupport.h
-dup2.o: dup2.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/memory.h ../../byterun/gc.h \
+ ../../byterun/mlvalues.h ../../byterun/major_gc.h \
+ ../../byterun/freelist.h ../../byterun/minor_gc.h unixsupport.h
 dup.o: dup.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+dup2.o: dup2.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 envir.o: envir.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/mlvalues.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
+ ../../byterun/mlvalues.h
 errmsg.o: errmsg.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/mlvalues.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
+ ../../byterun/mlvalues.h
 execv.o: execv.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/mlvalues.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/memory.h \
+ ../../byterun/gc.h ../../byterun/mlvalues.h ../../byterun/major_gc.h \
+ ../../byterun/freelist.h ../../byterun/minor_gc.h unixsupport.h
 execve.o: execve.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/mlvalues.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/memory.h \
+ ../../byterun/gc.h ../../byterun/mlvalues.h ../../byterun/major_gc.h \
+ ../../byterun/freelist.h ../../byterun/minor_gc.h unixsupport.h
 execvp.o: execvp.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/mlvalues.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/memory.h \
+ ../../byterun/gc.h ../../byterun/mlvalues.h ../../byterun/major_gc.h \
+ ../../byterun/freelist.h ../../byterun/minor_gc.h unixsupport.h
 exit.o: exit.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 fchmod.o: fchmod.c ../../byterun/fail.h ../../byterun/compatibility.h \
-  ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/mlvalues.h unixsupport.h
+ ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/mlvalues.h unixsupport.h
 fchown.o: fchown.c ../../byterun/fail.h ../../byterun/compatibility.h \
-  ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/mlvalues.h unixsupport.h
+ ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/mlvalues.h unixsupport.h
 fcntl.o: fcntl.c ../../byterun/fail.h ../../byterun/compatibility.h \
-  ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/mlvalues.h unixsupport.h
+ ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/mlvalues.h unixsupport.h
 fork.o: fork.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h \
-  ../../byterun/debugger.h ../../byterun/mlvalues.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h \
+ ../../byterun/debugger.h ../../byterun/mlvalues.h unixsupport.h
 ftruncate.o: ftruncate.c ../../byterun/fail.h \
-  ../../byterun/compatibility.h ../../byterun/misc.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/mlvalues.h ../../byterun/io.h unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/misc.h \
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/mlvalues.h ../../byterun/io.h unixsupport.h
 getaddrinfo.o: getaddrinfo.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
-  ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h \
-  cst2constr.h socketaddr.h ../../byterun/misc.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
+ ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h \
+ cst2constr.h socketaddr.h ../../byterun/misc.h
 getcwd.o: getcwd.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/mlvalues.h ../../byterun/fail.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
+ ../../byterun/mlvalues.h ../../byterun/fail.h unixsupport.h
 getegid.o: getegid.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h unixsupport.h
 geteuid.o: geteuid.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h unixsupport.h
 getgid.o: getgid.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 getgr.o: getgr.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/fail.h \
-  ../../byterun/mlvalues.h ../../byterun/alloc.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/fail.h \
+ ../../byterun/mlvalues.h ../../byterun/alloc.h ../../byterun/memory.h \
+ ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h unixsupport.h
 getgroups.o: getgroups.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  ../../byterun/fail.h unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ ../../byterun/fail.h unixsupport.h
 gethost.o: gethost.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
-  ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h \
-  socketaddr.h ../../byterun/misc.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
+ ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h \
+ socketaddr.h ../../byterun/misc.h
 gethostname.o: gethostname.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  ../../byterun/fail.h unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ ../../byterun/fail.h unixsupport.h
 getlogin.o: getlogin.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ unixsupport.h
 getnameinfo.o: getnameinfo.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
-  ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h \
-  socketaddr.h ../../byterun/misc.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
+ ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h \
+ socketaddr.h ../../byterun/misc.h
 getpeername.o: getpeername.c ../../byterun/fail.h \
-  ../../byterun/compatibility.h ../../byterun/misc.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/mlvalues.h unixsupport.h socketaddr.h \
-  ../../byterun/misc.h
+ ../../byterun/compatibility.h ../../byterun/misc.h \
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/mlvalues.h unixsupport.h socketaddr.h ../../byterun/misc.h
 getpid.o: getpid.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 getppid.o: getppid.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h unixsupport.h
 getproto.o: getproto.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
-  ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
+ ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h unixsupport.h
 getpw.o: getpw.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/mlvalues.h ../../byterun/memory.h ../../byterun/gc.h \
-  ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h ../../byterun/fail.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
+ ../../byterun/mlvalues.h ../../byterun/memory.h ../../byterun/gc.h \
+ ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h ../../byterun/fail.h unixsupport.h
 getserv.o: getserv.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
-  ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
+ ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h unixsupport.h
 getsockname.o: getsockname.c ../../byterun/fail.h \
-  ../../byterun/compatibility.h ../../byterun/misc.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/mlvalues.h unixsupport.h socketaddr.h \
-  ../../byterun/misc.h
+ ../../byterun/compatibility.h ../../byterun/misc.h \
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/mlvalues.h unixsupport.h socketaddr.h ../../byterun/misc.h
 gettimeofday.o: gettimeofday.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  ../../byterun/fail.h unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ ../../byterun/fail.h unixsupport.h
 getuid.o: getuid.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 gmtime.o: gmtime.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/mlvalues.h ../../byterun/fail.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
+ ../../byterun/mlvalues.h ../../byterun/fail.h ../../byterun/memory.h \
+ ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h unixsupport.h
 initgroups.o: initgroups.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  ../../byterun/fail.h unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ ../../byterun/fail.h unixsupport.h
 isatty.o: isatty.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 itimer.o: itimer.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/mlvalues.h ../../byterun/fail.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
+ ../../byterun/mlvalues.h ../../byterun/fail.h ../../byterun/memory.h \
+ ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h unixsupport.h
 kill.o: kill.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/fail.h \
-  ../../byterun/mlvalues.h unixsupport.h ../../byterun/signals.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/fail.h \
+ ../../byterun/mlvalues.h unixsupport.h ../../byterun/signals.h
 link.o: link.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 listen.o: listen.c ../../byterun/fail.h ../../byterun/compatibility.h \
-  ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/mlvalues.h unixsupport.h
+ ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/mlvalues.h unixsupport.h
 lockf.o: lockf.c ../../byterun/fail.h ../../byterun/compatibility.h \
-  ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/mlvalues.h ../../byterun/signals.h unixsupport.h
+ ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/mlvalues.h ../../byterun/signals.h unixsupport.h
 lseek.o: lseek.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/mlvalues.h ../../byterun/io.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
+ ../../byterun/mlvalues.h ../../byterun/io.h ../../byterun/signals.h \
+ unixsupport.h
 mkdir.o: mkdir.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 mkfifo.o: mkfifo.c ../../byterun/fail.h ../../byterun/compatibility.h \
-  ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/mlvalues.h unixsupport.h
+ ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/mlvalues.h unixsupport.h
 nice.o: nice.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 open.o: open.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/mlvalues.h ../../byterun/memory.h ../../byterun/gc.h \
-  ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
+ ../../byterun/mlvalues.h ../../byterun/memory.h ../../byterun/gc.h \
+ ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h
 opendir.o: opendir.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ unixsupport.h
 pipe.o: pipe.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/mlvalues.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
+ ../../byterun/mlvalues.h unixsupport.h
 putenv.o: putenv.c ../../byterun/fail.h ../../byterun/compatibility.h \
-  ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h \
-  ../../byterun/mlvalues.h unixsupport.h
+ ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
+ ../../byterun/freelist.h ../../byterun/minor_gc.h \
+ ../../byterun/mlvalues.h unixsupport.h
 read.o: read.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/mlvalues.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h \
-  ../../byterun/signals.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/memory.h \
+ ../../byterun/gc.h ../../byterun/mlvalues.h ../../byterun/major_gc.h \
+ ../../byterun/freelist.h ../../byterun/minor_gc.h \
+ ../../byterun/signals.h unixsupport.h
 readdir.o: readdir.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/fail.h ../../byterun/mlvalues.h \
-  ../../byterun/alloc.h unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/fail.h ../../byterun/mlvalues.h \
+ ../../byterun/alloc.h unixsupport.h
 readlink.o: readlink.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  ../../byterun/fail.h unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ ../../byterun/fail.h unixsupport.h
 rename.o: rename.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 rewinddir.o: rewinddir.c ../../byterun/fail.h \
-  ../../byterun/compatibility.h ../../byterun/misc.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/mlvalues.h unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/misc.h \
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/mlvalues.h unixsupport.h
 rmdir.o: rmdir.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 select.o: select.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/mlvalues.h ../../byterun/fail.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
+ ../../byterun/mlvalues.h ../../byterun/fail.h ../../byterun/memory.h \
+ ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h
 sendrecv.o: sendrecv.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
-  ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h \
-  socketaddr.h ../../byterun/misc.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
+ ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h \
+ socketaddr.h ../../byterun/misc.h
 setgid.o: setgid.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 setgroups.o: setgroups.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
-  ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
+ ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h unixsupport.h
 setsid.o: setsid.c ../../byterun/fail.h ../../byterun/compatibility.h \
-  ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/mlvalues.h unixsupport.h
+ ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/mlvalues.h unixsupport.h
 setuid.o: setuid.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 shutdown.o: shutdown.c ../../byterun/fail.h ../../byterun/compatibility.h \
-  ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/mlvalues.h unixsupport.h
+ ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/mlvalues.h unixsupport.h
 signals.o: signals.c ../../byterun/alloc.h ../../byterun/compatibility.h \
-  ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
-  ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h ../../byterun/mlvalues.h \
-  ../../byterun/signals.h unixsupport.h
+ ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/fail.h ../../byterun/memory.h ../../byterun/gc.h \
+ ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h ../../byterun/mlvalues.h \
+ ../../byterun/signals.h unixsupport.h
 sleep.o: sleep.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h \
-  ../../byterun/signals.h ../../byterun/mlvalues.h unixsupport.h
-socketaddr.o: socketaddr.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h unixsupport.h \
-  socketaddr.h ../../byterun/misc.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/signals.h \
+ ../../byterun/mlvalues.h unixsupport.h
 socket.o: socket.c ../../byterun/fail.h ../../byterun/compatibility.h \
-  ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/mlvalues.h unixsupport.h
+ ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/mlvalues.h unixsupport.h
+socketaddr.o: socketaddr.c ../../byterun/mlvalues.h \
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ ../../byterun/memory.h ../../byterun/gc.h ../../byterun/major_gc.h \
+ ../../byterun/freelist.h ../../byterun/minor_gc.h unixsupport.h \
+ socketaddr.h ../../byterun/misc.h
 socketpair.o: socketpair.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  ../../byterun/fail.h unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ ../../byterun/fail.h unixsupport.h
 sockopt.o: sockopt.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/memory.h ../../byterun/gc.h \
-  ../../byterun/mlvalues.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h ../../byterun/alloc.h \
-  ../../byterun/fail.h unixsupport.h socketaddr.h ../../byterun/misc.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/memory.h ../../byterun/gc.h \
+ ../../byterun/mlvalues.h ../../byterun/major_gc.h \
+ ../../byterun/freelist.h ../../byterun/minor_gc.h ../../byterun/alloc.h \
+ ../../byterun/fail.h unixsupport.h socketaddr.h ../../byterun/misc.h
 stat.o: stat.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/mlvalues.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h ../../byterun/alloc.h \
-  unixsupport.h cst2constr.h ../../byterun/io.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/memory.h \
+ ../../byterun/gc.h ../../byterun/mlvalues.h ../../byterun/major_gc.h \
+ ../../byterun/freelist.h ../../byterun/minor_gc.h ../../byterun/alloc.h \
+ unixsupport.h cst2constr.h ../../byterun/io.h
 strofaddr.o: strofaddr.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  ../../byterun/fail.h unixsupport.h socketaddr.h ../../byterun/misc.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ ../../byterun/fail.h unixsupport.h socketaddr.h ../../byterun/misc.h
 symlink.o: symlink.c ../../byterun/fail.h ../../byterun/compatibility.h \
-  ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/mlvalues.h unixsupport.h
+ ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/mlvalues.h unixsupport.h
 termios.o: termios.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  ../../byterun/fail.h unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ ../../byterun/fail.h unixsupport.h
 time.o: time.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/mlvalues.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
+ ../../byterun/mlvalues.h unixsupport.h
 times.o: times.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/mlvalues.h ../../byterun/memory.h ../../byterun/gc.h \
-  ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
+ ../../byterun/mlvalues.h ../../byterun/memory.h ../../byterun/gc.h \
+ ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h unixsupport.h
 truncate.o: truncate.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/fail.h ../../byterun/mlvalues.h \
-  ../../byterun/io.h unixsupport.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/fail.h ../../byterun/mlvalues.h \
+ ../../byterun/io.h unixsupport.h
 umask.o: umask.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 unixsupport.o: unixsupport.c ../../byterun/mlvalues.h \
-  ../../byterun/compatibility.h ../../byterun/config.h \
-  ../../byterun/../config/m.h ../../byterun/../config/s.h \
-  ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
-  ../../byterun/callback.h ../../byterun/memory.h ../../byterun/gc.h \
-  ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h ../../byterun/fail.h unixsupport.h \
-  cst2constr.h
+ ../../byterun/compatibility.h ../../byterun/config.h \
+ ../../byterun/../config/m.h ../../byterun/../config/s.h \
+ ../../byterun/misc.h ../../byterun/alloc.h ../../byterun/mlvalues.h \
+ ../../byterun/callback.h ../../byterun/memory.h ../../byterun/gc.h \
+ ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h ../../byterun/fail.h unixsupport.h cst2constr.h
 unlink.o: unlink.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h unixsupport.h
 utimes.o: utimes.c ../../byterun/fail.h ../../byterun/compatibility.h \
-  ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/mlvalues.h \
-  ../../byterun/mlvalues.h unixsupport.h
+ ../../byterun/misc.h ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/mlvalues.h \
+ ../../byterun/mlvalues.h unixsupport.h
 wait.o: wait.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
-  ../../byterun/mlvalues.h ../../byterun/fail.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
-  ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/alloc.h \
+ ../../byterun/mlvalues.h ../../byterun/fail.h ../../byterun/memory.h \
+ ../../byterun/gc.h ../../byterun/major_gc.h ../../byterun/freelist.h \
+ ../../byterun/minor_gc.h ../../byterun/signals.h unixsupport.h
 write.o: write.c ../../byterun/mlvalues.h ../../byterun/compatibility.h \
-  ../../byterun/config.h ../../byterun/../config/m.h \
-  ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/memory.h \
-  ../../byterun/gc.h ../../byterun/mlvalues.h ../../byterun/major_gc.h \
-  ../../byterun/freelist.h ../../byterun/minor_gc.h \
-  ../../byterun/signals.h unixsupport.h
-unixLabels.cmi: unix.cmi
+ ../../byterun/config.h ../../byterun/../config/m.h \
+ ../../byterun/../config/s.h ../../byterun/misc.h ../../byterun/memory.h \
+ ../../byterun/gc.h ../../byterun/mlvalues.h ../../byterun/major_gc.h \
+ ../../byterun/freelist.h ../../byterun/minor_gc.h \
+ ../../byterun/signals.h unixsupport.h
 unix.cmi:
-unixLabels.cmo: unix.cmi unixLabels.cmi
-unixLabels.cmx: unix.cmx unixLabels.cmi
+unixLabels.cmi: unix.cmi
 unix.cmo: unix.cmi
 unix.cmx: unix.cmi
+unixLabels.cmo: unix.cmi unixLabels.cmi
+unixLabels.cmx: unix.cmx unixLabels.cmi
diff -Nru jocaml-3.12.0/otherlibs/unix/lseek.c jocaml-3.12.1/otherlibs/unix/lseek.c
--- jocaml-3.12.0/otherlibs/unix/lseek.c	2010-06-04 19:17:18.000000000 +0000
+++ jocaml-3.12.1/otherlibs/unix/lseek.c	2011-07-07 14:32:00.000000000 +0000
@@ -11,13 +11,14 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: lseek.c 10509 2010-06-04 19:17:18Z maranget $ */
+/* $Id: lseek.c 11113 2011-07-07 14:32:00Z maranget $ */
 
 #include <errno.h>
 #include <sys/types.h>
 #include <mlvalues.h>
 #include <alloc.h>
 #include <io.h>
+#include <signals.h>
 #include "unixsupport.h"
 
 #ifdef HAS_UNISTD
diff -Nru jocaml-3.12.0/otherlibs/unix/unixLabels.mli jocaml-3.12.1/otherlibs/unix/unixLabels.mli
--- jocaml-3.12.0/otherlibs/unix/unixLabels.mli	2010-06-04 19:17:18.000000000 +0000
+++ jocaml-3.12.1/otherlibs/unix/unixLabels.mli	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: unixLabels.mli 10509 2010-06-04 19:17:18Z maranget $ *)
+(* $Id: unixLabels.mli 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (** Interface to the Unix system.
    To use as replacement to default {!Unix} module,
@@ -146,7 +146,9 @@
   | WSTOPPED of int
         (** The process was stopped by a signal; the argument is the
            signal number. *)
-(** The termination status of a process. *)
+(** The termination status of a process.  See module {!Sys} for the
+    definitions of the standard signal numbers.  Note that they are
+    not the numbers used by the OS. *)
 
 
 type wait_flag = Unix.wait_flag =
@@ -167,11 +169,11 @@
    environment to the program executed. *)
 
 val execvp : prog:string -> args:string array -> 'a
-(** Same as {!UnixLabels.execv} respectively, except that
+(** Same as {!UnixLabels.execv}, except that
    the program is searched in the path. *)
 
 val execvpe : prog:string -> args:string array -> env:string array -> 'a
-(** Same as {!UnixLabels.execvp} respectively, except that
+(** Same as {!UnixLabels.execve}, except that
    the program is searched in the path. *)
 
 val fork : unit -> int
@@ -183,7 +185,7 @@
    and termination status. *)
 
 val waitpid : mode:wait_flag list -> int -> int * process_status
-(** Same as {!UnixLabels.wait}, but waits for the process whose pid is given.
+(** Same as {!UnixLabels.wait}, but waits for the child process whose pid is given.
    A pid of [-1] means wait for any child.
    A pid of [0] means wait for any child in the same process group
    as the current process.
@@ -472,7 +474,6 @@
    See {!UnixLabels.set_close_on_exec}.*)
 
 
-
 (** {6 Directories} *)
 
 
@@ -670,7 +671,6 @@
    the functions {!Sys.signal} and {!Sys.set_signal}.
 *)
 
-
 val kill : pid:int -> signal:int -> unit
 (** [kill pid sig] sends signal number [sig] to the process
    with id [pid]. *)
@@ -764,7 +764,8 @@
 val utimes : string -> access:float -> modif:float -> unit
 (** Set the last access time (second arg) and last modification time
    (third arg) for a file. Times are expressed in seconds from
-   00:00:00 GMT, Jan. 1, 1970. *)
+   00:00:00 GMT, Jan. 1, 1970.  A time of [0.0] is interpreted as the
+   current time. *)
 
 type interval_timer = Unix.interval_timer =
     ITIMER_REAL
@@ -823,6 +824,16 @@
 (** Return the list of groups to which the user executing the process
    belongs. *)
 
+val setgroups : int array -> unit
+  (** [setgroups groups] sets the supplementary group IDs for the
+      calling process. Appropriate privileges are required. *)
+
+val initgroups : string -> int -> unit
+  (** [initgroups user group] initializes the group access list by
+      reading the group database /etc/group and using all groups of
+      which [user] is a member. The additional group [group] is also
+      added to the list. *)
+
 type passwd_entry = Unix.passwd_entry =
   { pw_name : string;
     pw_passwd : string;
@@ -903,7 +914,8 @@
     PF_UNIX                     (** Unix domain *)
   | PF_INET                     (** Internet domain (IPv4) *)
   | PF_INET6                    (** Internet domain (IPv6) *)
-(** The type of socket domains. *)
+(** The type of socket domains.  Not all platforms support
+    IPv6 sockets (type [PF_INET6]). *)
 
 type socket_type = Unix.socket_type =
     SOCK_STREAM                 (** Stream socket *)
diff -Nru jocaml-3.12.0/otherlibs/unix/unix.mli jocaml-3.12.1/otherlibs/unix/unix.mli
--- jocaml-3.12.0/otherlibs/unix/unix.mli	2010-06-04 19:17:18.000000000 +0000
+++ jocaml-3.12.1/otherlibs/unix/unix.mli	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: unix.mli 10509 2010-06-04 19:17:18Z maranget $ *)
+(* $Id: unix.mli 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (** Interface to the Unix system *)
 
@@ -911,7 +911,7 @@
   | PF_INET                     (** Internet domain (IPv4) *)
   | PF_INET6                    (** Internet domain (IPv6) *)
 (** The type of socket domains.  Not all platforms support
-    IPv6 sockets (type [PF_INET6]).  *)
+    IPv6 sockets (type [PF_INET6]). *)
 
 type socket_type =
     SOCK_STREAM                 (** Stream socket *)
@@ -921,7 +921,9 @@
 (** The type of socket kinds, specifying the semantics of
    communications. *)
 
-type sockaddr = ADDR_UNIX of string | ADDR_INET of inet_addr * int
+type sockaddr =
+    ADDR_UNIX of string
+  | ADDR_INET of inet_addr * int
 (** The type of socket addresses. [ADDR_UNIX name] is a socket
    address in the Unix domain; [name] is a file name in the file
    system. [ADDR_INET(addr,port)] is a socket address in the Internet
@@ -1270,7 +1272,7 @@
    file descriptor. *)
 
 type setattr_when =
-  TCSANOW
+    TCSANOW
   | TCSADRAIN
   | TCSAFLUSH
 
diff -Nru jocaml-3.12.0/otherlibs/win32unix/channels.c jocaml-3.12.1/otherlibs/win32unix/channels.c
--- jocaml-3.12.0/otherlibs/win32unix/channels.c	2010-06-04 19:17:18.000000000 +0000
+++ jocaml-3.12.1/otherlibs/win32unix/channels.c	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: channels.c 10509 2010-06-04 19:17:18Z maranget $ */
+/* $Id: channels.c 11113 2011-07-07 14:32:00Z maranget $ */
 
 #include <mlvalues.h>
 #include <alloc.h>
@@ -30,6 +30,7 @@
   } else {
     int fd = _open_osfhandle((long) Handle_val(handle), O_BINARY);
     if (fd == -1) uerror("channel_of_descr", Nothing);
+    CRT_fd_val(handle) = fd;
     return fd;
   }
 }
diff -Nru jocaml-3.12.0/otherlibs/win32unix/close.c jocaml-3.12.1/otherlibs/win32unix/close.c
--- jocaml-3.12.0/otherlibs/win32unix/close.c	2004-05-27 09:18:38.000000000 +0000
+++ jocaml-3.12.1/otherlibs/win32unix/close.c	2011-07-07 14:32:00.000000000 +0000
@@ -11,10 +11,13 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: close.c 6336 2004-05-27 09:18:38Z maranget $ */
+/* $Id: close.c 11113 2011-07-07 14:32:00Z maranget $ */
 
 #include <mlvalues.h>
 #include "unixsupport.h"
+#include <io.h>
+
+extern int _close(int);
 
 CAMLprim value unix_close(value fd)
 {
@@ -24,9 +27,17 @@
       uerror("close", Nothing);
     }
   } else {
-    if (! CloseHandle(Handle_val(fd))) {
-      win32_maperr(GetLastError());
-      uerror("close", Nothing);
+    /* If we have an fd then closing it also closes
+     * the underlying handle. Also, closing only
+     * the handle and not the fd leads to fd leaks. */
+    if (CRT_fd_val(fd) != NO_CRT_FD) {
+      if (_close(CRT_fd_val(fd)) != 0)
+         uerror("close", Nothing);
+    } else {
+      if (! CloseHandle(Handle_val(fd))) {
+        win32_maperr(GetLastError());
+        uerror("close", Nothing);
+      }
     }
   }
   return Val_unit;
diff -Nru jocaml-3.12.0/parsing/parser.mly jocaml-3.12.1/parsing/parser.mly
--- jocaml-3.12.0/parsing/parser.mly	2010-06-29 13:52:11.000000000 +0000
+++ jocaml-3.12.1/parsing/parser.mly	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: parser.mly 10611 2010-06-29 13:52:11Z maranget $ */
+/* $Id: parser.mly 11113 2011-07-07 14:32:00Z maranget $ */
 
 /* The parser definition */
 
@@ -1444,7 +1444,7 @@
 package_type:
     mty_longident { ($1, []) }
   | mty_longident WITH package_type_cstrs { ($1, $3) }
-
+;
 package_type_cstr:
     TYPE LIDENT EQUAL core_type { ($2, $4) }
 ;
diff -Nru jocaml-3.12.0/README_OCAML jocaml-3.12.1/README_OCAML
--- jocaml-3.12.0/README_OCAML	2009-08-21 08:39:33.000000000 +0000
+++ jocaml-3.12.1/README_OCAML	2011-07-07 14:32:00.000000000 +0000
@@ -21,7 +21,7 @@
 
 Tier 1 (actively used and maintained by the core Caml team):
 
-    AMD64 (Opteron)    Linux
+    AMD64 (Opteron)    Linux, MacOS X, MS Windows
     IA32 (Pentium)     Linux, FreeBSD, MacOS X, MS Windows
     PowerPC            MacOS X
 
@@ -84,7 +84,7 @@
 
 INSTALLATION:
 
-See the file INSTALL for installation instructions on Unix, Linux and 
+See the file INSTALL for installation instructions on Unix, Linux and
 MacOS X machines.  For MS Windows, see README.win32.
 
 DOCUMENTATION:
@@ -135,4 +135,4 @@
 
 
 ----
-$Id: README_OCAML 9322 2009-08-21 08:39:33Z maranget $
+$Id: README_OCAML 11113 2011-07-07 14:32:00Z maranget $
diff -Nru jocaml-3.12.0/stdlib/arg.ml jocaml-3.12.1/stdlib/arg.ml
--- jocaml-3.12.0/stdlib/arg.ml	2008-10-14 07:37:28.000000000 +0000
+++ jocaml-3.12.1/stdlib/arg.ml	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: arg.ml 9081 2008-10-14 07:37:28Z maranget $ *)
+(* $Id: arg.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 type key = string
 type doc = string
@@ -90,10 +90,14 @@
   List.iter (print_spec buf) (add_help speclist);
 ;;
 
-let usage speclist errmsg =
+let usage_string speclist errmsg =
   let b = Buffer.create 200 in
   usage_b b speclist errmsg;
-  eprintf "%s" (Buffer.contents b);
+  Buffer.contents b;
+;;
+
+let usage speclist errmsg =
+  eprintf "%s" (usage_string speclist errmsg);
 ;;
 
 let current = ref 0;;
diff -Nru jocaml-3.12.0/stdlib/arg.mli jocaml-3.12.1/stdlib/arg.mli
--- jocaml-3.12.0/stdlib/arg.mli	2008-10-14 07:37:28.000000000 +0000
+++ jocaml-3.12.1/stdlib/arg.mli	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: arg.mli 9081 2008-10-14 07:37:28Z maranget $ *)
+(* $Id: arg.mli 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (** Parsing of command line arguments.
 
@@ -79,7 +79,7 @@
     as their arguments appear on the command line.
 
     If an error occurs, [Arg.parse] exits the program, after printing
-    an error message as follows:
+    to standard error an error message as follows:
 -   The reason for the error: unknown option, invalid or missing argument, etc.
 -   [usage_msg]
 -   The list of options, each followed by the corresponding [doc] string.
@@ -88,9 +88,9 @@
     [-], include for example [("-", String anon_fun, doc)] in [speclist].
 
     By default, [parse] recognizes two unit options, [-help] and [--help],
-    which will display [usage_msg] and the list of options, and exit
-    the program.  You can override this behaviour by specifying your
-    own [-help] and [--help] options in [speclist].
+    which will print to standard output [usage_msg] and the list of
+    options, and exit the program.  You can override this behaviour
+    by specifying your own [-help] and [--help] options in [speclist].
 *)
 
 val parse_argv : ?current: int ref -> string array ->
@@ -115,11 +115,15 @@
     [Arg.Bad] is also raised by [Arg.parse_argv] in case of an error. *)
 
 val usage : (key * spec * doc) list -> usage_msg -> unit
-(** [Arg.usage speclist usage_msg] prints an error message including
-    the list of valid options.  This is the same message that
-    {!Arg.parse} prints in case of error.
+(** [Arg.usage speclist usage_msg] prints to standard error
+    an error message that includes the list of valid options.  This is
+    the same message that {!Arg.parse} prints in case of error.
     [speclist] and [usage_msg] are the same as for [Arg.parse]. *)
 
+val usage_string : (key * spec * doc) list -> usage_msg -> string
+(** Returns the message that would have been printed by {!Arg.usage},
+    if provided with the same parameters. *)
+
 val align: (key * spec * doc) list -> (key * spec * doc) list;;
 (** Align the documentation strings by inserting spaces at the first
     space, according to the length of the keyword.  Use a
diff -Nru jocaml-3.12.0/stdlib/.depend jocaml-3.12.1/stdlib/.depend
--- jocaml-3.12.0/stdlib/.depend	2010-06-04 19:17:45.000000000 +0000
+++ jocaml-3.12.1/stdlib/.depend	2011-07-07 14:32:00.000000000 +0000
@@ -1,248 +1,248 @@
-arg.cmi: 
-arrayLabels.cmi: 
-array.cmi: 
-buffer.cmi: 
-callback.cmi: 
-camlinternalLazy.cmi: 
-camlinternalMod.cmi: obj.cmi 
-camlinternalOO.cmi: obj.cmi 
-char.cmi: 
-complex.cmi: 
-digest.cmi: 
-filename.cmi: 
-format.cmi: pervasives.cmi buffer.cmi 
-gc.cmi: 
-genlex.cmi: stream.cmi 
-hashtbl.cmi: 
-int32.cmi: 
-int64.cmi: 
-lazy.cmi: 
-lexing.cmi: 
-listLabels.cmi: 
-list.cmi: 
-map.cmi: 
-marshal.cmi: 
-moreLabels.cmi: set.cmi map.cmi hashtbl.cmi 
-nativeint.cmi: 
-obj.cmi: int32.cmi 
-oo.cmi: camlinternalOO.cmi 
-parsing.cmi: obj.cmi lexing.cmi 
-pervasives.cmi: 
-printexc.cmi: 
-printf.cmi: obj.cmi buffer.cmi 
-queue.cmi: 
-random.cmi: nativeint.cmi int64.cmi int32.cmi 
-scanf.cmi: pervasives.cmi 
-set.cmi: 
-sort.cmi: 
-stack.cmi: 
-stdLabels.cmi: 
-stream.cmi: 
-stringLabels.cmi: 
-string.cmi: 
-sys.cmi: 
-weak.cmi: hashtbl.cmi 
-arg.cmo: sys.cmi string.cmi printf.cmi list.cmi buffer.cmi array.cmi arg.cmi 
-arg.cmx: sys.cmx string.cmx printf.cmx list.cmx buffer.cmx array.cmx arg.cmi 
-arrayLabels.cmo: array.cmi arrayLabels.cmi 
-arrayLabels.cmx: array.cmx arrayLabels.cmi 
-array.cmo: array.cmi 
-array.cmx: array.cmi 
-buffer.cmo: sys.cmi string.cmi buffer.cmi 
-buffer.cmx: sys.cmx string.cmx buffer.cmi 
-callback.cmo: obj.cmi callback.cmi 
-callback.cmx: obj.cmx callback.cmi 
-camlinternalLazy.cmo: obj.cmi camlinternalLazy.cmi 
-camlinternalLazy.cmx: obj.cmx camlinternalLazy.cmi 
-camlinternalMod.cmo: obj.cmi camlinternalOO.cmi array.cmi camlinternalMod.cmi 
-camlinternalMod.cmx: obj.cmx camlinternalOO.cmx array.cmx camlinternalMod.cmi 
+arg.cmi:
+array.cmi:
+arrayLabels.cmi:
+buffer.cmi:
+callback.cmi:
+camlinternalLazy.cmi:
+camlinternalMod.cmi: obj.cmi
+camlinternalOO.cmi: obj.cmi
+char.cmi:
+complex.cmi:
+digest.cmi:
+filename.cmi:
+format.cmi: pervasives.cmi buffer.cmi
+gc.cmi:
+genlex.cmi: stream.cmi
+hashtbl.cmi:
+int32.cmi:
+int64.cmi:
+lazy.cmi:
+lexing.cmi:
+list.cmi:
+listLabels.cmi:
+map.cmi:
+marshal.cmi:
+moreLabels.cmi: set.cmi map.cmi hashtbl.cmi
+nativeint.cmi:
+obj.cmi: int32.cmi
+oo.cmi: camlinternalOO.cmi
+parsing.cmi: obj.cmi lexing.cmi
+pervasives.cmi:
+printexc.cmi:
+printf.cmi: obj.cmi buffer.cmi
+queue.cmi:
+random.cmi: nativeint.cmi int64.cmi int32.cmi
+scanf.cmi: pervasives.cmi
+set.cmi:
+sort.cmi:
+stack.cmi:
+stdLabels.cmi:
+stream.cmi:
+string.cmi:
+stringLabels.cmi:
+sys.cmi:
+weak.cmi: hashtbl.cmi
+arg.cmo: sys.cmi string.cmi printf.cmi list.cmi buffer.cmi array.cmi arg.cmi
+arg.cmx: sys.cmx string.cmx printf.cmx list.cmx buffer.cmx array.cmx arg.cmi
+array.cmo: array.cmi
+array.cmx: array.cmi
+arrayLabels.cmo: array.cmi arrayLabels.cmi
+arrayLabels.cmx: array.cmx arrayLabels.cmi
+buffer.cmo: sys.cmi string.cmi buffer.cmi
+buffer.cmx: sys.cmx string.cmx buffer.cmi
+callback.cmo: obj.cmi callback.cmi
+callback.cmx: obj.cmx callback.cmi
+camlinternalLazy.cmo: obj.cmi camlinternalLazy.cmi
+camlinternalLazy.cmx: obj.cmx camlinternalLazy.cmi
+camlinternalMod.cmo: obj.cmi camlinternalOO.cmi array.cmi camlinternalMod.cmi
+camlinternalMod.cmx: obj.cmx camlinternalOO.cmx array.cmx camlinternalMod.cmi
 camlinternalOO.cmo: sys.cmi string.cmi obj.cmi map.cmi list.cmi char.cmi \
-    array.cmi camlinternalOO.cmi 
+    array.cmi camlinternalOO.cmi
 camlinternalOO.cmx: sys.cmx string.cmx obj.cmx map.cmx list.cmx char.cmx \
-    array.cmx camlinternalOO.cmi 
-char.cmo: char.cmi 
-char.cmx: char.cmi 
-complex.cmo: complex.cmi 
-complex.cmx: complex.cmi 
-digest.cmo: string.cmi printf.cmi digest.cmi 
-digest.cmx: string.cmx printf.cmx digest.cmi 
+    array.cmx camlinternalOO.cmi
+char.cmo: char.cmi
+char.cmx: char.cmi
+complex.cmo: complex.cmi
+complex.cmx: complex.cmi
+digest.cmo: string.cmi printf.cmi digest.cmi
+digest.cmx: string.cmx printf.cmx digest.cmi
 filename.cmo: sys.cmi string.cmi random.cmi printf.cmi buffer.cmi \
-    filename.cmi 
+    filename.cmi
 filename.cmx: sys.cmx string.cmx random.cmx printf.cmx buffer.cmx \
-    filename.cmi 
+    filename.cmi
 format.cmo: string.cmi printf.cmi pervasives.cmi obj.cmi list.cmi buffer.cmi \
-    format.cmi 
+    format.cmi
 format.cmx: string.cmx printf.cmx pervasives.cmx obj.cmx list.cmx buffer.cmx \
-    format.cmi 
-gc.cmo: sys.cmi printf.cmi gc.cmi 
-gc.cmx: sys.cmx printf.cmx gc.cmi 
-genlex.cmo: string.cmi stream.cmi list.cmi hashtbl.cmi char.cmi genlex.cmi 
-genlex.cmx: string.cmx stream.cmx list.cmx hashtbl.cmx char.cmx genlex.cmi 
-hashtbl.cmo: sys.cmi array.cmi hashtbl.cmi 
-hashtbl.cmx: sys.cmx array.cmx hashtbl.cmi 
-int32.cmo: pervasives.cmi int32.cmi 
-int32.cmx: pervasives.cmx int32.cmi 
-int64.cmo: pervasives.cmi int64.cmi 
-int64.cmx: pervasives.cmx int64.cmi 
-lazy.cmo: obj.cmi camlinternalLazy.cmi lazy.cmi 
-lazy.cmx: obj.cmx camlinternalLazy.cmx lazy.cmi 
-lexing.cmo: sys.cmi string.cmi array.cmi lexing.cmi 
-lexing.cmx: sys.cmx string.cmx array.cmx lexing.cmi 
-listLabels.cmo: list.cmi listLabels.cmi 
-listLabels.cmx: list.cmx listLabels.cmi 
-list.cmo: list.cmi 
-list.cmx: list.cmi 
-map.cmo: map.cmi 
-map.cmx: map.cmi 
-marshal.cmo: string.cmi marshal.cmi 
-marshal.cmx: string.cmx marshal.cmi 
-moreLabels.cmo: set.cmi map.cmi hashtbl.cmi moreLabels.cmi 
-moreLabels.cmx: set.cmx map.cmx hashtbl.cmx moreLabels.cmi 
-nativeint.cmo: sys.cmi pervasives.cmi nativeint.cmi 
-nativeint.cmx: sys.cmx pervasives.cmx nativeint.cmi 
-obj.cmo: marshal.cmi int32.cmi array.cmi obj.cmi 
-obj.cmx: marshal.cmx int32.cmx array.cmx obj.cmi 
-oo.cmo: camlinternalOO.cmi oo.cmi 
-oo.cmx: camlinternalOO.cmx oo.cmi 
-parsing.cmo: obj.cmi lexing.cmi array.cmi parsing.cmi 
-parsing.cmx: obj.cmx lexing.cmx array.cmx parsing.cmi 
-pervasives.cmo: pervasives.cmi 
-pervasives.cmx: pervasives.cmi 
-printexc.cmo: printf.cmi obj.cmi buffer.cmi array.cmi printexc.cmi 
-printexc.cmx: printf.cmx obj.cmx buffer.cmx array.cmx printexc.cmi 
+    format.cmi
+gc.cmo: sys.cmi printf.cmi gc.cmi
+gc.cmx: sys.cmx printf.cmx gc.cmi
+genlex.cmo: string.cmi stream.cmi list.cmi hashtbl.cmi char.cmi genlex.cmi
+genlex.cmx: string.cmx stream.cmx list.cmx hashtbl.cmx char.cmx genlex.cmi
+hashtbl.cmo: sys.cmi array.cmi hashtbl.cmi
+hashtbl.cmx: sys.cmx array.cmx hashtbl.cmi
+int32.cmo: pervasives.cmi int32.cmi
+int32.cmx: pervasives.cmx int32.cmi
+int64.cmo: pervasives.cmi int64.cmi
+int64.cmx: pervasives.cmx int64.cmi
+lazy.cmo: obj.cmi camlinternalLazy.cmi lazy.cmi
+lazy.cmx: obj.cmx camlinternalLazy.cmx lazy.cmi
+lexing.cmo: sys.cmi string.cmi array.cmi lexing.cmi
+lexing.cmx: sys.cmx string.cmx array.cmx lexing.cmi
+list.cmo: list.cmi
+list.cmx: list.cmi
+listLabels.cmo: list.cmi listLabels.cmi
+listLabels.cmx: list.cmx listLabels.cmi
+map.cmo: map.cmi
+map.cmx: map.cmi
+marshal.cmo: string.cmi marshal.cmi
+marshal.cmx: string.cmx marshal.cmi
+moreLabels.cmo: set.cmi map.cmi hashtbl.cmi moreLabels.cmi
+moreLabels.cmx: set.cmx map.cmx hashtbl.cmx moreLabels.cmi
+nativeint.cmo: sys.cmi pervasives.cmi nativeint.cmi
+nativeint.cmx: sys.cmx pervasives.cmx nativeint.cmi
+obj.cmo: marshal.cmi int32.cmi array.cmi obj.cmi
+obj.cmx: marshal.cmx int32.cmx array.cmx obj.cmi
+oo.cmo: camlinternalOO.cmi oo.cmi
+oo.cmx: camlinternalOO.cmx oo.cmi
+parsing.cmo: obj.cmi lexing.cmi array.cmi parsing.cmi
+parsing.cmx: obj.cmx lexing.cmx array.cmx parsing.cmi
+pervasives.cmo: pervasives.cmi
+pervasives.cmx: pervasives.cmi
+printexc.cmo: printf.cmi obj.cmi buffer.cmi array.cmi printexc.cmi
+printexc.cmx: printf.cmx obj.cmx buffer.cmx array.cmx printexc.cmi
 printf.cmo: string.cmi pervasives.cmi obj.cmi list.cmi char.cmi buffer.cmi \
-    array.cmi printf.cmi 
+    array.cmi printf.cmi
 printf.cmx: string.cmx pervasives.cmx obj.cmx list.cmx char.cmx buffer.cmx \
-    array.cmx printf.cmi 
-queue.cmo: obj.cmi queue.cmi 
-queue.cmx: obj.cmx queue.cmi 
+    array.cmx printf.cmi
+queue.cmo: obj.cmi queue.cmi
+queue.cmx: obj.cmx queue.cmi
 random.cmo: string.cmi pervasives.cmi nativeint.cmi int64.cmi int32.cmi \
-    digest.cmi char.cmi array.cmi random.cmi 
+    digest.cmi char.cmi array.cmi random.cmi
 random.cmx: string.cmx pervasives.cmx nativeint.cmx int64.cmx int32.cmx \
-    digest.cmx char.cmx array.cmx random.cmi 
+    digest.cmx char.cmx array.cmx random.cmi
 scanf.cmo: string.cmi printf.cmi pervasives.cmi obj.cmi list.cmi hashtbl.cmi \
-    buffer.cmi array.cmi scanf.cmi 
+    buffer.cmi array.cmi scanf.cmi
 scanf.cmx: string.cmx printf.cmx pervasives.cmx obj.cmx list.cmx hashtbl.cmx \
-    buffer.cmx array.cmx scanf.cmi 
-set.cmo: set.cmi 
-set.cmx: set.cmi 
-sort.cmo: array.cmi sort.cmi 
-sort.cmx: array.cmx sort.cmi 
-stack.cmo: list.cmi stack.cmi 
-stack.cmx: list.cmx stack.cmi 
-std_exit.cmo: 
-std_exit.cmx: 
-stdLabels.cmo: stringLabels.cmi listLabels.cmi arrayLabels.cmi stdLabels.cmi 
-stdLabels.cmx: stringLabels.cmx listLabels.cmx arrayLabels.cmx stdLabels.cmi 
-stream.cmo: string.cmi obj.cmi list.cmi lazy.cmi stream.cmi 
-stream.cmx: string.cmx obj.cmx list.cmx lazy.cmx stream.cmi 
-stringLabels.cmo: string.cmi stringLabels.cmi 
-stringLabels.cmx: string.cmx stringLabels.cmi 
-string.cmo: pervasives.cmi list.cmi char.cmi string.cmi 
-string.cmx: pervasives.cmx list.cmx char.cmx string.cmi 
-sys.cmo: sys.cmi 
-sys.cmx: sys.cmi 
-weak.cmo: sys.cmi obj.cmi hashtbl.cmi array.cmi weak.cmi 
-weak.cmx: sys.cmx obj.cmx hashtbl.cmx array.cmx weak.cmi 
-arg.cmo: sys.cmi string.cmi printf.cmi list.cmi buffer.cmi array.cmi arg.cmi 
-arg.p.cmx: sys.p.cmx string.p.cmx printf.p.cmx list.p.cmx buffer.p.cmx array.p.cmx arg.cmi 
-arrayLabels.cmo: array.cmi arrayLabels.cmi 
-arrayLabels.p.cmx: array.p.cmx arrayLabels.cmi 
-array.cmo: array.cmi 
-array.p.cmx: array.cmi 
-buffer.cmo: sys.cmi string.cmi buffer.cmi 
-buffer.p.cmx: sys.p.cmx string.p.cmx buffer.cmi 
-callback.cmo: obj.cmi callback.cmi 
-callback.p.cmx: obj.p.cmx callback.cmi 
-camlinternalLazy.cmo: obj.cmi camlinternalLazy.cmi 
-camlinternalLazy.p.cmx: obj.p.cmx camlinternalLazy.cmi 
-camlinternalMod.cmo: obj.cmi camlinternalOO.cmi array.cmi camlinternalMod.cmi 
-camlinternalMod.p.cmx: obj.p.cmx camlinternalOO.p.cmx array.p.cmx camlinternalMod.cmi 
+    buffer.cmx array.cmx scanf.cmi
+set.cmo: set.cmi
+set.cmx: set.cmi
+sort.cmo: array.cmi sort.cmi
+sort.cmx: array.cmx sort.cmi
+stack.cmo: list.cmi stack.cmi
+stack.cmx: list.cmx stack.cmi
+stdLabels.cmo: stringLabels.cmi listLabels.cmi arrayLabels.cmi stdLabels.cmi
+stdLabels.cmx: stringLabels.cmx listLabels.cmx arrayLabels.cmx stdLabels.cmi
+std_exit.cmo:
+std_exit.cmx:
+stream.cmo: string.cmi obj.cmi list.cmi lazy.cmi stream.cmi
+stream.cmx: string.cmx obj.cmx list.cmx lazy.cmx stream.cmi
+string.cmo: pervasives.cmi list.cmi char.cmi string.cmi
+string.cmx: pervasives.cmx list.cmx char.cmx string.cmi
+stringLabels.cmo: string.cmi stringLabels.cmi
+stringLabels.cmx: string.cmx stringLabels.cmi
+sys.cmo: sys.cmi
+sys.cmx: sys.cmi
+weak.cmo: sys.cmi obj.cmi hashtbl.cmi array.cmi weak.cmi
+weak.cmx: sys.cmx obj.cmx hashtbl.cmx array.cmx weak.cmi
+arg.cmo: sys.cmi string.cmi printf.cmi list.cmi buffer.cmi array.cmi arg.cmi
+arg.p.cmx: sys.p.cmx string.p.cmx printf.p.cmx list.p.cmx buffer.p.cmx array.p.cmx arg.cmi
+array.cmo: array.cmi
+array.p.cmx: array.cmi
+arrayLabels.cmo: array.cmi arrayLabels.cmi
+arrayLabels.p.cmx: array.p.cmx arrayLabels.cmi
+buffer.cmo: sys.cmi string.cmi buffer.cmi
+buffer.p.cmx: sys.p.cmx string.p.cmx buffer.cmi
+callback.cmo: obj.cmi callback.cmi
+callback.p.cmx: obj.p.cmx callback.cmi
+camlinternalLazy.cmo: obj.cmi camlinternalLazy.cmi
+camlinternalLazy.p.cmx: obj.p.cmx camlinternalLazy.cmi
+camlinternalMod.cmo: obj.cmi camlinternalOO.cmi array.cmi camlinternalMod.cmi
+camlinternalMod.p.cmx: obj.p.cmx camlinternalOO.p.cmx array.p.cmx camlinternalMod.cmi
 camlinternalOO.cmo: sys.cmi string.cmi obj.cmi map.cmi list.cmi char.cmi \
-    array.cmi camlinternalOO.cmi 
+    array.cmi camlinternalOO.cmi
 camlinternalOO.p.cmx: sys.p.cmx string.p.cmx obj.p.cmx map.p.cmx list.p.cmx char.p.cmx \
-    array.p.cmx camlinternalOO.cmi 
-char.cmo: char.cmi 
-char.p.cmx: char.cmi 
-complex.cmo: complex.cmi 
-complex.p.cmx: complex.cmi 
-digest.cmo: string.cmi printf.cmi digest.cmi 
-digest.p.cmx: string.p.cmx printf.p.cmx digest.cmi 
+    array.p.cmx camlinternalOO.cmi
+char.cmo: char.cmi
+char.p.cmx: char.cmi
+complex.cmo: complex.cmi
+complex.p.cmx: complex.cmi
+digest.cmo: string.cmi printf.cmi digest.cmi
+digest.p.cmx: string.p.cmx printf.p.cmx digest.cmi
 filename.cmo: sys.cmi string.cmi random.cmi printf.cmi buffer.cmi \
-    filename.cmi 
+    filename.cmi
 filename.p.cmx: sys.p.cmx string.p.cmx random.p.cmx printf.p.cmx buffer.p.cmx \
-    filename.cmi 
+    filename.cmi
 format.cmo: string.cmi printf.cmi pervasives.cmi obj.cmi list.cmi buffer.cmi \
-    format.cmi 
+    format.cmi
 format.p.cmx: string.p.cmx printf.p.cmx pervasives.p.cmx obj.p.cmx list.p.cmx buffer.p.cmx \
-    format.cmi 
-gc.cmo: sys.cmi printf.cmi gc.cmi 
-gc.p.cmx: sys.p.cmx printf.p.cmx gc.cmi 
-genlex.cmo: string.cmi stream.cmi list.cmi hashtbl.cmi char.cmi genlex.cmi 
-genlex.p.cmx: string.p.cmx stream.p.cmx list.p.cmx hashtbl.p.cmx char.p.cmx genlex.cmi 
-hashtbl.cmo: sys.cmi array.cmi hashtbl.cmi 
-hashtbl.p.cmx: sys.p.cmx array.p.cmx hashtbl.cmi 
-int32.cmo: pervasives.cmi int32.cmi 
-int32.p.cmx: pervasives.p.cmx int32.cmi 
-int64.cmo: pervasives.cmi int64.cmi 
-int64.p.cmx: pervasives.p.cmx int64.cmi 
-lazy.cmo: obj.cmi camlinternalLazy.cmi lazy.cmi 
-lazy.p.cmx: obj.p.cmx camlinternalLazy.p.cmx lazy.cmi 
-lexing.cmo: sys.cmi string.cmi array.cmi lexing.cmi 
-lexing.p.cmx: sys.p.cmx string.p.cmx array.p.cmx lexing.cmi 
-listLabels.cmo: list.cmi listLabels.cmi 
-listLabels.p.cmx: list.p.cmx listLabels.cmi 
-list.cmo: list.cmi 
-list.p.cmx: list.cmi 
-map.cmo: map.cmi 
-map.p.cmx: map.cmi 
-marshal.cmo: string.cmi marshal.cmi 
-marshal.p.cmx: string.p.cmx marshal.cmi 
-moreLabels.cmo: set.cmi map.cmi hashtbl.cmi moreLabels.cmi 
-moreLabels.p.cmx: set.p.cmx map.p.cmx hashtbl.p.cmx moreLabels.cmi 
-nativeint.cmo: sys.cmi pervasives.cmi nativeint.cmi 
-nativeint.p.cmx: sys.p.cmx pervasives.p.cmx nativeint.cmi 
-obj.cmo: marshal.cmi int32.cmi array.cmi obj.cmi 
-obj.p.cmx: marshal.p.cmx int32.p.cmx array.p.cmx obj.cmi 
-oo.cmo: camlinternalOO.cmi oo.cmi 
-oo.p.cmx: camlinternalOO.p.cmx oo.cmi 
-parsing.cmo: obj.cmi lexing.cmi array.cmi parsing.cmi 
-parsing.p.cmx: obj.p.cmx lexing.p.cmx array.p.cmx parsing.cmi 
-pervasives.cmo: pervasives.cmi 
-pervasives.p.cmx: pervasives.cmi 
-printexc.cmo: printf.cmi obj.cmi buffer.cmi array.cmi printexc.cmi 
-printexc.p.cmx: printf.p.cmx obj.p.cmx buffer.p.cmx array.p.cmx printexc.cmi 
+    format.cmi
+gc.cmo: sys.cmi printf.cmi gc.cmi
+gc.p.cmx: sys.p.cmx printf.p.cmx gc.cmi
+genlex.cmo: string.cmi stream.cmi list.cmi hashtbl.cmi char.cmi genlex.cmi
+genlex.p.cmx: string.p.cmx stream.p.cmx list.p.cmx hashtbl.p.cmx char.p.cmx genlex.cmi
+hashtbl.cmo: sys.cmi array.cmi hashtbl.cmi
+hashtbl.p.cmx: sys.p.cmx array.p.cmx hashtbl.cmi
+int32.cmo: pervasives.cmi int32.cmi
+int32.p.cmx: pervasives.p.cmx int32.cmi
+int64.cmo: pervasives.cmi int64.cmi
+int64.p.cmx: pervasives.p.cmx int64.cmi
+lazy.cmo: obj.cmi camlinternalLazy.cmi lazy.cmi
+lazy.p.cmx: obj.p.cmx camlinternalLazy.p.cmx lazy.cmi
+lexing.cmo: sys.cmi string.cmi array.cmi lexing.cmi
+lexing.p.cmx: sys.p.cmx string.p.cmx array.p.cmx lexing.cmi
+list.cmo: list.cmi
+list.p.cmx: list.cmi
+listLabels.cmo: list.cmi listLabels.cmi
+listLabels.p.cmx: list.p.cmx listLabels.cmi
+map.cmo: map.cmi
+map.p.cmx: map.cmi
+marshal.cmo: string.cmi marshal.cmi
+marshal.p.cmx: string.p.cmx marshal.cmi
+moreLabels.cmo: set.cmi map.cmi hashtbl.cmi moreLabels.cmi
+moreLabels.p.cmx: set.p.cmx map.p.cmx hashtbl.p.cmx moreLabels.cmi
+nativeint.cmo: sys.cmi pervasives.cmi nativeint.cmi
+nativeint.p.cmx: sys.p.cmx pervasives.p.cmx nativeint.cmi
+obj.cmo: marshal.cmi int32.cmi array.cmi obj.cmi
+obj.p.cmx: marshal.p.cmx int32.p.cmx array.p.cmx obj.cmi
+oo.cmo: camlinternalOO.cmi oo.cmi
+oo.p.cmx: camlinternalOO.p.cmx oo.cmi
+parsing.cmo: obj.cmi lexing.cmi array.cmi parsing.cmi
+parsing.p.cmx: obj.p.cmx lexing.p.cmx array.p.cmx parsing.cmi
+pervasives.cmo: pervasives.cmi
+pervasives.p.cmx: pervasives.cmi
+printexc.cmo: printf.cmi obj.cmi buffer.cmi array.cmi printexc.cmi
+printexc.p.cmx: printf.p.cmx obj.p.cmx buffer.p.cmx array.p.cmx printexc.cmi
 printf.cmo: string.cmi pervasives.cmi obj.cmi list.cmi char.cmi buffer.cmi \
-    array.cmi printf.cmi 
+    array.cmi printf.cmi
 printf.p.cmx: string.p.cmx pervasives.p.cmx obj.p.cmx list.p.cmx char.p.cmx buffer.p.cmx \
-    array.p.cmx printf.cmi 
-queue.cmo: obj.cmi queue.cmi 
-queue.p.cmx: obj.p.cmx queue.cmi 
+    array.p.cmx printf.cmi
+queue.cmo: obj.cmi queue.cmi
+queue.p.cmx: obj.p.cmx queue.cmi
 random.cmo: string.cmi pervasives.cmi nativeint.cmi int64.cmi int32.cmi \
-    digest.cmi char.cmi array.cmi random.cmi 
+    digest.cmi char.cmi array.cmi random.cmi
 random.p.cmx: string.p.cmx pervasives.p.cmx nativeint.p.cmx int64.p.cmx int32.p.cmx \
-    digest.p.cmx char.p.cmx array.p.cmx random.cmi 
+    digest.p.cmx char.p.cmx array.p.cmx random.cmi
 scanf.cmo: string.cmi printf.cmi pervasives.cmi obj.cmi list.cmi hashtbl.cmi \
-    buffer.cmi array.cmi scanf.cmi 
+    buffer.cmi array.cmi scanf.cmi
 scanf.p.cmx: string.p.cmx printf.p.cmx pervasives.p.cmx obj.p.cmx list.p.cmx hashtbl.p.cmx \
-    buffer.p.cmx array.p.cmx scanf.cmi 
-set.cmo: set.cmi 
-set.p.cmx: set.cmi 
-sort.cmo: array.cmi sort.cmi 
-sort.p.cmx: array.p.cmx sort.cmi 
-stack.cmo: list.cmi stack.cmi 
-stack.p.cmx: list.p.cmx stack.cmi 
-std_exit.cmo: 
-std_exit.p.cmx: 
-stdLabels.cmo: stringLabels.cmi listLabels.cmi arrayLabels.cmi stdLabels.cmi 
-stdLabels.p.cmx: stringLabels.p.cmx listLabels.p.cmx arrayLabels.p.cmx stdLabels.cmi 
-stream.cmo: string.cmi obj.cmi list.cmi lazy.cmi stream.cmi 
-stream.p.cmx: string.p.cmx obj.p.cmx list.p.cmx lazy.p.cmx stream.cmi 
-stringLabels.cmo: string.cmi stringLabels.cmi 
-stringLabels.p.cmx: string.p.cmx stringLabels.cmi 
-string.cmo: pervasives.cmi list.cmi char.cmi string.cmi 
-string.p.cmx: pervasives.p.cmx list.p.cmx char.p.cmx string.cmi 
-sys.cmo: sys.cmi 
-sys.p.cmx: sys.cmi 
-weak.cmo: sys.cmi obj.cmi hashtbl.cmi array.cmi weak.cmi 
-weak.p.cmx: sys.p.cmx obj.p.cmx hashtbl.p.cmx array.p.cmx weak.cmi 
+    buffer.p.cmx array.p.cmx scanf.cmi
+set.cmo: set.cmi
+set.p.cmx: set.cmi
+sort.cmo: array.cmi sort.cmi
+sort.p.cmx: array.p.cmx sort.cmi
+stack.cmo: list.cmi stack.cmi
+stack.p.cmx: list.p.cmx stack.cmi
+stdLabels.cmo: stringLabels.cmi listLabels.cmi arrayLabels.cmi stdLabels.cmi
+stdLabels.p.cmx: stringLabels.p.cmx listLabels.p.cmx arrayLabels.p.cmx stdLabels.cmi
+std_exit.cmo:
+std_exit.p.cmx:
+stream.cmo: string.cmi obj.cmi list.cmi lazy.cmi stream.cmi
+stream.p.cmx: string.p.cmx obj.p.cmx list.p.cmx lazy.p.cmx stream.cmi
+string.cmo: pervasives.cmi list.cmi char.cmi string.cmi
+string.p.cmx: pervasives.p.cmx list.p.cmx char.p.cmx string.cmi
+stringLabels.cmo: string.cmi stringLabels.cmi
+stringLabels.p.cmx: string.p.cmx stringLabels.cmi
+sys.cmo: sys.cmi
+sys.p.cmx: sys.cmi
+weak.cmo: sys.cmi obj.cmi hashtbl.cmi array.cmi weak.cmi
+weak.p.cmx: sys.p.cmx obj.p.cmx hashtbl.p.cmx array.p.cmx weak.cmi
diff -Nru jocaml-3.12.0/stdlib/filename.mli jocaml-3.12.1/stdlib/filename.mli
--- jocaml-3.12.0/stdlib/filename.mli	2010-06-04 19:17:45.000000000 +0000
+++ jocaml-3.12.1/stdlib/filename.mli	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: filename.mli 10510 2010-06-04 19:17:45Z maranget $ *)
+(* $Id: filename.mli 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (** Operations on file names. *)
 
@@ -82,6 +82,7 @@
    (readable and writable only by the file owner).  The file is
    guaranteed to be different from any other file that existed when
    [temp_file] was called.
+   Raise [Sys_error] if the file could not be created.
    @before 3.11.2 no ?temp_dir optional argument
 *)
 
@@ -95,6 +96,7 @@
    [mode] is a list of additional flags to control the opening of the file.
    It can contain one or several of [Open_append], [Open_binary],
    and [Open_text].  The default is [[Open_text]] (open in text mode).
+   Raise [Sys_error] if the file could not be opened.
    @before 3.11.2 no ?temp_dir optional argument
 *)
 
diff -Nru jocaml-3.12.0/stdlib/format.mli jocaml-3.12.1/stdlib/format.mli
--- jocaml-3.12.0/stdlib/format.mli	2010-06-04 19:17:45.000000000 +0000
+++ jocaml-3.12.1/stdlib/format.mli	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: format.mli 10510 2010-06-04 19:17:45Z maranget $ *)
+(* $Id: format.mli 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (** Pretty printing.
 
@@ -689,11 +689,11 @@
 (** {6 Deprecated} *)
 
 val bprintf : Buffer.t -> ('a, formatter, unit) format -> 'a;;
-(** Deprecated and error prone function. Do not use it.
+(** A deprecated and error prone function. Do not use it.
 
   If you need to print to some buffer [b], you must first define a
   formatter writing to [b], using [let to_b = formatter_of_buffer b]; then
   use regular calls to [Format.fprintf] on formatter [to_b]. *)
 
 val kprintf : (string -> 'a) -> ('b, unit, string, 'a) format4 -> 'b;;
-(** Deprecated name. A synonym for [ksprintf]. *)
+(** A deprecated synonym for [ksprintf]. *)
diff -Nru jocaml-3.12.0/stdlib/parsing.ml jocaml-3.12.1/stdlib/parsing.ml
--- jocaml-3.12.0/stdlib/parsing.ml	2009-08-21 08:39:33.000000000 +0000
+++ jocaml-3.12.1/stdlib/parsing.ml	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: parsing.ml 9322 2009-08-21 08:39:33Z maranget $ *)
+(* $Id: parsing.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* The parsing engine *)
 
@@ -151,6 +151,7 @@
   and init_stackbase = env.stackbase
   and init_state = env.state
   and init_curr_char = env.curr_char
+  and init_lval = env.lval
   and init_errflag = env.errflag in
   env.stackbase <- env.sp + 1;
   env.curr_char <- start;
@@ -164,6 +165,7 @@
     env.stackbase <- init_stackbase;
     env.state <- init_state;
     env.curr_char <- init_curr_char;
+    env.lval <- init_lval;
     env.errflag <- init_errflag;
     match exn with
       YYexit v ->
diff -Nru jocaml-3.12.0/stdlib/pervasives.mli jocaml-3.12.1/stdlib/pervasives.mli
--- jocaml-3.12.0/stdlib/pervasives.mli	2010-06-29 13:52:11.000000000 +0000
+++ jocaml-3.12.1/stdlib/pervasives.mli	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: pervasives.mli 10611 2010-06-29 13:52:11Z maranget $ *)
+(* $Id: pervasives.mli 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (** The initially opened module.
 
@@ -310,7 +310,7 @@
     Result is in radians and is between [-pi/2] and [pi/2]. *)
 
 external atan2 : float -> float -> float = "caml_atan2_float" "atan2" "float"
-(** [atan x y] returns the arc tangent of [y /. x].  The signs of [x]
+(** [atan2 y x] returns the arc tangent of [y /. x].  The signs of [x]
     and [y] are used to determine the quadrant of the result.
     Result is in radians and is between [-pi] and [pi]. *)
 
@@ -505,7 +505,7 @@
 (** The standard output for the process. *)
 
 val stderr : out_channel
-(** The standard error ouput for the process. *)
+(** The standard error output for the process. *)
 
 
 (** {7 Output functions on standard output} *)
@@ -858,9 +858,14 @@
     included for backward compatibility with earlier releases of Objective
     Caml.
     ['a] is the type of the parameters of the format,
-    ['c] is the result type for the "printf"-style function,
-    and ['b] is the type of the first argument given to
-    [%a] and [%t] printing functions. *)
+    ['b] is the type of the first argument given to
+         [%a] and [%t] printing functions,
+    ['c] is the type of the argument transmitted to the first argument of
+         "kprintf"-style functions,
+    ['d] is the result type for the "scanf"-style functions,
+    ['e] is the type of the receiver function for the "scanf"-style functions,
+    ['f] is the result type for the "printf"-style function.
+ *)
 type ('a, 'b, 'c, 'd) format4 = ('a, 'b, 'c, 'c, 'c, 'd) format6
 
 type ('a, 'b, 'c) format = ('a, 'b, 'c, 'c) format4
diff -Nru jocaml-3.12.0/stdlib/printf.ml jocaml-3.12.1/stdlib/printf.ml
--- jocaml-3.12.0/stdlib/printf.ml	2010-06-04 19:17:45.000000000 +0000
+++ jocaml-3.12.1/stdlib/printf.ml	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: printf.ml 10510 2010-06-04 19:17:45Z maranget $ *)
+(* $Id: printf.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 external format_float: string -> float -> string
   = "caml_format_float"
@@ -106,6 +106,7 @@
   then String.blit s i res 0 len
   else String.blit s i res (p - len) len;
   res
+;;
 
 (* Format a string given a %s format, e.g. %40s or %-20s.
    To do ?: ignore other flags (#, +, etc). *)
@@ -196,7 +197,8 @@
 ;;
 
 let sub_format_for_printf conv =
-  sub_format incomplete_format bad_conversion_format conv;;
+  sub_format incomplete_format bad_conversion_format conv
+;;
 
 let iter_on_format_args fmt add_conv add_char =
 
@@ -307,7 +309,7 @@
 
 let count_arguments_of_format fmt =
   let ac = ac_of_format fmt in
-  (* For printing only regular arguments have to be counted. *)
+  (* For printing, only the regular arguments have to be counted. *)
   ac.ac_rglr
 ;;
 
@@ -376,7 +378,7 @@
    Note that this is optimized for the regular case, i.e. no positional
    parameter, since in this case we juste ``return'' the constant
    [Spec_none]; in case we have a positional parameter, we ``return'' a
-   [Spec_index] [positional_specification] which a bit more costly.
+   [Spec_index] [positional_specification] which is a bit more costly.
 
    Note also that we do not support [*$] specifications, since this would
    lead to type checking problems: a [*$] positional specification means
@@ -663,9 +665,13 @@
   mkprintf true get_buff Buffer.add_char Buffer.add_string ignore (get_cont k)
 ;;
 
+let sprintf fmt = ksprintf (fun s -> s) fmt;;
+
+(* Obsolete and deprecated. *)
 let kprintf = ksprintf;;
 
-let sprintf fmt = ksprintf (fun s -> s) fmt;;
+(* For Caml system internal use only: needed to implement modules [Format]
+  and [Scanf]. *)
 
 module CamlinternalPr = struct
 
diff -Nru jocaml-3.12.0/stdlib/printf.mli jocaml-3.12.1/stdlib/printf.mli
--- jocaml-3.12.0/stdlib/printf.mli	2010-06-04 19:17:45.000000000 +0000
+++ jocaml-3.12.1/stdlib/printf.mli	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: printf.mli 10510 2010-06-04 19:17:45Z maranget $ *)
+(* $Id: printf.mli 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (** Formatted output functions. *)
 
@@ -75,7 +75,7 @@
    - [( fmt %)]: format string substitution. Takes a format string
      argument and substitutes it to the internal format string [fmt]
      to print following arguments. The argument must have the same
-     type as [fmt].
+     type as the internal format string [fmt].
    - [!]: take no argument and flush the output.
    - [%]: take no argument and output one [%] character.
    - [,]: the no-op delimiter for conversion specifications.
@@ -146,12 +146,14 @@
    @since 3.10.0
 *)
 
+(** Deprecated *)
+
 val kprintf : (string -> 'a) -> ('b, unit, string, 'a) format4 -> 'b;;
 (** A deprecated synonym for [ksprintf]. *)
 
 (**/**)
 
-(* For system use only.  Don't call directly. *)
+(* For Caml system internal use only. Don't call directly. *)
 
 module CamlinternalPr : sig
 
diff -Nru jocaml-3.12.0/stdlib/scanf.mli jocaml-3.12.1/stdlib/scanf.mli
--- jocaml-3.12.0/stdlib/scanf.mli	2010-06-04 19:17:45.000000000 +0000
+++ jocaml-3.12.1/stdlib/scanf.mli	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: scanf.mli 10510 2010-06-04 19:17:45Z maranget $ *)
+(* $Id: scanf.mli 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (** Formatted input functions. *)
 
@@ -99,35 +99,42 @@
     Note: a scanning action may often require to examine one character in
     advance; when this ``lookahead'' character does not belong to the token
     read, it is stored back in the scanning buffer and becomes the next
-    character read. *)
+    character yet to be read. *)
 
 val stdin : in_channel;;
-(** The standard input notion for the module [Scanf].
-    [stdin] is equivalent to [Scanning.from_channel Pervasives.stdin].
-
-    Note: when input is read interactively from [stdin], the newline character
-    that triggers the evaluation is incorporated in the input; thus, scanning
-    specifications must properly skip this character (simply add a ['\n']
-    as the last character of the format string).
+(** The standard input notion for the [Scanf] module.
+    [Scanning.stdin] is the formatted input channel attached to
+    [Pervasives.stdin].
+
+    Note: in the interactive system, when input is read from [stdin], the
+    newline character that triggers the evaluation is incorporated in the
+    input; thus, the scanning specifications must properly skip this
+    additional newline character (for instance, simply add a ['\n'] as the
+    last character of the format string).
     @since 3.12.0
 *)
 
 val open_in : string -> in_channel;;
-(** Bufferized file reading in text mode. The efficient and usual
-    way to scan text mode files (in effect, [from_file] returns a
-    scanning buffer that reads characters in large chunks, rather than one
-    character at a time as buffers returned by [from_channel] below do).
-    [Scanning.from_file fname] returns a scanning buffer which reads
-    from the given file [fname] in text mode.
+(** [Scanning.open_in fname] returns a formatted input channel for bufferized
+    reading in text mode of file [fname].
+
+    Note:
+    [open_in] returns a formatted input channel that efficiently reads
+    characters in large chunks; in contrast, [from_channel] below returns
+    formatted input channels that must read one character at a time, leading
+    to a much slower scanning rate.
     @since 3.12.0
 *)
 
 val open_in_bin : string -> in_channel;;
-(** Bufferized file reading in binary mode. @since 3.12.0 *)
+(** [Scanning.open_in_bin fname] returns a formatted input channel for bufferized
+    reading in binary mode of file [fname].
+    @since 3.12.0
+*)
 
 val close_in : in_channel -> unit;;
-(** Close the [Pervasives.input_channel] associated with the given
-  [Scanning.in_channel].
+(** Closes the [Pervasives.input_channel] associated with the given
+  [Scanning.in_channel] formatted input channel.
   @since 3.12.0
 *)
 
@@ -143,8 +150,8 @@
     The end-of-input condition is set when the end of the string is reached. *)
 
 val from_function : (unit -> char) -> in_channel;;
-(** [Scanning.from_function f] returns a scanning buffer with the given
-    function as its reading method.
+(** [Scanning.from_function f] returns a formatted input channel with the
+    given function as its reading method.
 
     When scanning needs one more character, the given function is called.
 
@@ -165,7 +172,7 @@
     the given formatted input channel. *)
 
 val name_of_input : in_channel -> string;;
-(** [Scanning.file_name_of_input ic] returns the name of the character source
+(** [Scanning.name_of_input ic] returns the name of the character source
     for the formatted input channel [ic].
     @since 3.09.0
 *)
@@ -223,7 +230,7 @@
 (** The format is a character string which contains three types of
     objects:
     - plain characters, which are simply matched with the characters of the
-      input (with a special case for {!Scanf.space} and line feed),
+      input (with a special case for space and line feed, see {!Scanf.space}),
     - conversion specifications, each of which causes reading and conversion of
       one argument for the function [f] (see {!Scanf.conversion}),
     - scanning indications to specify boundaries of tokens
@@ -264,11 +271,11 @@
     - [x] or [X]: reads an unsigned hexadecimal integer ([[0-9a-f]+] or [[0-9A-F]+]).
     - [o]: reads an unsigned octal integer ([[0-7]+]).
     - [s]: reads a string argument that spreads as much as possible, until the
-      following bounding condition holds:
-      - a whitespace has been found (see {!Scanf.space}),
-      - a scanning indication (see scanning {!Scanf.indication}) has been
-        encountered,
-      - the end-of-input has been reached.
+      following bounding condition holds: {ul
+      {- a whitespace has been found (see {!Scanf.space}),}
+      {- a scanning indication (see scanning {!Scanf.indication}) has been
+         encountered,}
+      {- the end-of-input has been reached.}}
       Hence, this conversion always succeeds: it returns an empty
       string, if the bounding condition holds when the scan begins.
     - [S]: reads a delimited string argument (delimiters and special
@@ -314,23 +321,27 @@
       The format string read must have the same type as the format string
       specification [fmt].
       For instance, ["%{ %i %}"] reads any format string that can read a value of
-      type [int]; hence [Scanf.sscanf "fmt:\"number is %u\"" "fmt:%{%i%}"]
-      succeeds and returns the format string ["number is %u"].
+      type [int]; hence, if [s] is the string ["fmt:\"number is %u\""], then
+      [Scanf.sscanf s "fmt: %{%i%}"] succeeds and returns the format string
+      ["number is %u"].
     - [\( fmt %\)]: scanning format substitution.
-      Reads a format string to read with it instead of [fmt].
+      Reads a format string and then goes on scanning with the format string
+      read, instead of using [fmt].
       The format string read must have the same type as the format string
-      specification [fmt] that is replaces.
+      specification [fmt] that it replaces.
       For instance, ["%( %i %)"] reads any format string that can read a value
       of type [int].
       Returns the format string read, and the value read using the format
       string read.
-      Hence, [Scanf.sscanf "\"%4d\"1234.00" "%(%i%)"
-                (fun fmt i -> fmt, i)] evaluates to [("%4d", 1234)].
+      Hence, if [s] is the string ["\"%4d\"1234.00"], then
+      [Scanf.sscanf s "%(%i%)" (fun fmt i -> fmt, i)] evaluates to
+      [("%4d", 1234)].
       If the special flag [_] is used, the conversion discards the
       format string read and only returns the value read with the format
       string read.
-      Hence, [Scanf.sscanf "\"%4d\"1234.00" "%_(%i%)"] is simply
-      equivalent to [Scanf.sscanf "1234.00" "%4d"].
+      Hence, if [s] is the string ["\"%4d\"1234.00"], then
+      [Scanf.sscanf s "%_(%i%)"] is simply equivalent to
+      [Scanf.sscanf "1234.00" "%4d"].
     - [l]: returns the number of lines read so far.
     - [n]: returns the number of characters read so far.
     - [N] or [L]: returns the number of tokens read so far.
@@ -341,8 +352,8 @@
     Following the [%] character that introduces a conversion, there may be
     the special flag [_]: the conversion that follows occurs as usual,
     but the resulting value is discarded.
-    For instance, if [f] is the function [fun i -> i + 1], then
-    [Scanf.sscanf "x = 1" "%_s = %i" f] returns [2].
+    For instance, if [f] is the function [fun i -> i + 1], and [s] is the
+    string ["x = 1"], then [Scanf.sscanf s "%_s = %i" f] returns [2].
 
     The field width is composed of an optional integer literal
     indicating the maximal width of the token to read.
@@ -419,7 +430,7 @@
     Warning: since all formatted input functions operate from a {e formatted
     input channel}, be aware that each [fscanf] invocation will operate with a
     formatted input channel reading from the given channel. This extra level
-    of bufferization can lead to strange scanning behaviour if you use low
+    of bufferization can lead to a strange scanning behaviour if you use low
     level primitives on the channel (reading characters, seeking the reading
     position, and so on).
 
@@ -439,7 +450,7 @@
 (** Same as {!Scanf.bscanf}, but takes an additional function argument
     [ef] that is called in case of error: if the scanning process or
     some conversion fails, the scanning function aborts and calls the
-    error handling function [ef] with the scanning buffer and the
+    error handling function [ef] with the formatted input channel and the
     exception that aborted the scanning process as arguments. *)
 
 (** {6 Reading format strings from input} *)
diff -Nru jocaml-3.12.0/stdlib/string.ml jocaml-3.12.1/stdlib/string.ml
--- jocaml-3.12.0/stdlib/string.ml	2009-08-21 08:39:33.000000000 +0000
+++ jocaml-3.12.1/stdlib/string.ml	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: string.ml 9322 2009-08-21 08:39:33Z maranget $ *)
+(* $Id: string.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* String operations *)
 
@@ -180,4 +180,4 @@
 
 type t = string
 
-let compare = Pervasives.compare
+let compare (x: t) (y: t) = Pervasives.compare x y
diff -Nru jocaml-3.12.0/stdlib/sys.mli jocaml-3.12.1/stdlib/sys.mli
--- jocaml-3.12.0/stdlib/sys.mli	2010-06-04 19:17:45.000000000 +0000
+++ jocaml-3.12.1/stdlib/sys.mli	2011-07-07 14:32:00.000000000 +0000
@@ -11,7 +11,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: sys.mli 10510 2010-06-04 19:17:45Z maranget $ *)
+(* $Id: sys.mli 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (** System interface. *)
 
@@ -31,7 +31,7 @@
 (** Returns [true] if the given name refers to a directory,
     [false] if it refers to another kind of file.
     Raise [Sys_error] if no file exists with the given name.
-    @since 3.12.0
+    @since 3.10.0
 *)
 
 external remove : string -> unit = "caml_sys_remove"
diff -Nru jocaml-3.12.0/test/.cvsignore jocaml-3.12.1/test/.cvsignore
--- jocaml-3.12.0/test/.cvsignore	1995-08-29 08:33:39.000000000 +0000
+++ jocaml-3.12.1/test/.cvsignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-*.byt
-*.out
diff -Nru jocaml-3.12.0/test/.depend jocaml-3.12.1/test/.depend
--- jocaml-3.12.0/test/.depend	1995-07-20 08:02:06.000000000 +0000
+++ jocaml-3.12.1/test/.depend	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-KB/equations.cmi: KB/terms.cmi 
-KB/kb.cmi: KB/equations.cmi KB/terms.cmi 
-KB/orderings.cmi: KB/terms.cmi 
-KB/equations.cmo: KB/equations.cmi KB/terms.cmi 
-KB/equations.cmx: KB/equations.cmi KB/terms.cmx 
-KB/kb.cmo: KB/kb.cmi KB/equations.cmi KB/terms.cmi 
-KB/kb.cmx: KB/kb.cmi KB/equations.cmx KB/terms.cmx 
-KB/kbmain.cmo: KB/kb.cmi KB/orderings.cmi KB/equations.cmi KB/terms.cmi 
-KB/kbmain.cmx: KB/kb.cmx KB/orderings.cmx KB/equations.cmx KB/terms.cmx 
-KB/orderings.cmo: KB/orderings.cmi KB/terms.cmi 
-KB/orderings.cmx: KB/orderings.cmi KB/terms.cmx 
-KB/terms.cmo: KB/terms.cmi 
-KB/terms.cmx: KB/terms.cmi 
-Lex/grammar.cmi: Lex/syntax.cmo 
-Lex/gram_aux.cmo: Lex/syntax.cmo 
-Lex/gram_aux.cmx: Lex/syntax.cmx 
-Lex/grammar.cmo: Lex/grammar.cmi Lex/gram_aux.cmo Lex/syntax.cmo 
-Lex/grammar.cmx: Lex/grammar.cmi Lex/gram_aux.cmx Lex/syntax.cmx 
-Lex/lexgen.cmo: Lex/syntax.cmo 
-Lex/lexgen.cmx: Lex/syntax.cmx 
-Lex/main.cmo: Lex/lexgen.cmo Lex/output.cmo Lex/grammar.cmi \
-    Lex/scanner.cmo Lex/syntax.cmo Lex/scan_aux.cmo 
-Lex/main.cmx: Lex/lexgen.cmx Lex/output.cmx Lex/grammar.cmx \
-    Lex/scanner.cmx Lex/syntax.cmx Lex/scan_aux.cmx 
-Lex/output.cmo: Lex/syntax.cmo 
-Lex/output.cmx: Lex/syntax.cmx 
-Lex/scanner.cmo: Lex/syntax.cmo Lex/scan_aux.cmo Lex/grammar.cmi 
-Lex/scanner.cmx: Lex/syntax.cmx Lex/scan_aux.cmx Lex/grammar.cmx 
diff -Nru jocaml-3.12.0/test/test_bng.c jocaml-3.12.1/test/test_bng.c
--- jocaml-3.12.0/test/test_bng.c	2010-06-04 19:19:07.000000000 +0000
+++ jocaml-3.12.1/test/test_bng.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,408 +0,0 @@
-/***********************************************************************/
-/*                                                                     */
-/*                           Objective Caml                            */
-/*                                                                     */
-/*            Xavier Leroy, projet Cristal, INRIA Rocquencourt         */
-/*                                                                     */
-/*  Copyright 2003 Institut National de Recherche en Informatique et   */
-/*  en Automatique.  All rights reserved.  This file is distributed    */
-/*  under the terms of the GNU Library General Public License, with    */
-/*  the special exception on linking described in file ../../LICENSE.  */
-/*                                                                     */
-/***********************************************************************/
-
-/* $Id: test_bng.c 5900 2003-11-07 07:59:10Z xleroy $ */
-
-/* Test harness for the BNG primitives.  Use BigNum as a reference. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <BigNum.h>
-
-#include "../../../config/m.h"
-#include "bng.h"
-
-#if defined(__GNUC__) && BNG_ASM_LEVEL > 0
-#if defined(BNG_ARCH_ia32)
-#include "bng_ia32.c"
-#elif defined(BNG_ARCH_amd64)
-#include "bng_amd64.c"
-#elif defined(BNG_ARCH_ppc)
-#include "bng_ppc.c"
-#elif defined (BNG_ARCH_alpha)
-#include "bng_alpha.c"
-#elif defined (BNG_ARCH_sparc)
-#include "bng_sparc.c"
-#elif defined (BNG_ARCH_mips)
-#include "bng_mips.c"
-#endif
-#endif
-
-#include "bng_digit.c"
-
-/* Random generator for digits.  Can either generate "true" PRN numbers
-   or numbers consisting of long sequences of 0 and 1 bits. */
-
-static int rand_skewed = 0;
-static int rand_runlength = 0;
-static int rand_bit = 0;
-static bngdigit rand_seed = 0;
-
-static bngdigit randdigit(void)
-{
-  bngdigit res;
-  int i;
-
-  if (rand_skewed) {
-    for (i = 0, res = 0; i < BNG_BITS_PER_DIGIT; i++) {
-      if (rand_runlength == 0) {
-        rand_runlength = 1 + (rand() % (2 * BNG_BITS_PER_DIGIT));
-        rand_bit ^= 1;
-      }
-      res = (res << 1) | rand_bit;
-      rand_runlength--;
-    }
-    return res;
-  } else {
-    rand_seed = rand_seed * 69069 + 25173;
-    return rand_seed;
-  }
-}
-
-/* Test the operations on digits.  
-   This uses double-width integer arithmetic as reference.
-   This is only available on 32-bit platforms that support a 64-bit int type.
-*/
-
-#if defined(ARCH_UINT64_TYPE) && !defined(ARCH_SIXTYFOUR)
-
-typedef ARCH_UINT64_TYPE dbldigit;
-
-static int test_digit_ops(int i)
-{
-  bngdigit a1, a2, a3, r1, r2;
-  int ci, co, n;
-
-  a1 = randdigit();
-  a2 = randdigit();
-  a3 = randdigit();
-  ci = randdigit() & 1;
-
-  BngAdd2(r1,co,a1,a2);
-  if ((dbldigit) r1 + ((dbldigit) co << BNG_BITS_PER_DIGIT)
-      != (dbldigit) a1 + (dbldigit) a2) {
-    printf("Round %d, BngAdd2(%lx,%x,%lx, %lx)\n", i, r1, co, a1, a2);
-    return 1;
-  }
-
-  BngAdd2Carry(r1,co,a1,a2,ci);
-  if ((dbldigit) r1 + ((dbldigit) co << BNG_BITS_PER_DIGIT)
-      != (dbldigit) a1 + (dbldigit) a2 + (dbldigit) ci) {
-    printf("Round %d, BngAdd2Carry(%lx,%x,%lx, %lx, %x)\n", i, r1, co, a1, a2, ci);
-    return 1;
-  }
-
-  r2 = 0;
-  BngAdd3(r1,r2,a1,a2,a3);
-  if ((dbldigit) r1 + ((dbldigit) r2 << BNG_BITS_PER_DIGIT)
-      != (dbldigit) a1 + (dbldigit) a2 + (dbldigit) a3) {
-    printf("Round %d, BngAdd3(%lx,%x,%lx, %lx, %lx)\n", i, r1, co, a1, a2, a3);
-    return 1;
-  }
-
-  BngSub2(r1,co,a1,a2);
-  if ((dbldigit) r1 - ((dbldigit) co << BNG_BITS_PER_DIGIT)
-      != (dbldigit) a1 - (dbldigit) a2) {
-    printf("Round %d, BngSub2(%lx,%x,%lx, %lx)\n", i, r1, co, a1, a2);
-    return 1;
-  }
-
-  BngSub2Carry(r1,co,a1,a2,ci);
-  if ((dbldigit) r1 - ((dbldigit) co << BNG_BITS_PER_DIGIT)
-      != (dbldigit) a1 - (dbldigit) a2 - (dbldigit) ci) {
-    printf("Round %d, BngSub2Carry(%lx,%x,%lx, %lx, %x)\n", i, r1, co, a1, a2, ci);
-    return 1;
-  }
-
-  r2 = 0;
-  BngSub3(r1,r2,a1,a2,a3);
-  if ((dbldigit) r1 - ((dbldigit) r2 << BNG_BITS_PER_DIGIT)
-      != (dbldigit) a1 - (dbldigit) a2 - (dbldigit) a3) {
-    printf("Round %d, BngSub3(%lx,%x,%lx, %lx, %lx)\n", i, r1, co, a1, a2, a3);
-    return 1;
-  }
-
-  BngMult(r1,r2,a1,a2);
-  if ((((dbldigit) r1 << BNG_BITS_PER_DIGIT) | (dbldigit) r2)
-      != (dbldigit) a1 * (dbldigit) a2) {
-    printf("Round %d, BngMult(%lx,%lx,%lx, %lx)\n", i, r1, r2, a1, a2);
-    return 1;
-  }
-
-  /* Make sure a3 is normalized */
-  a3 |= 1L << (BNG_BITS_PER_DIGIT - 1);
-  if (a1 < a3) {
-    BngDiv(r1,r2,a1,a2,a3);
-    if (r1 != (((dbldigit) a1 << BNG_BITS_PER_DIGIT) | (dbldigit) a2) / a3
-        ||
-        r2 != (((dbldigit) a1 << BNG_BITS_PER_DIGIT) | (dbldigit) a2) % a3)
-      {
-        printf("Round %d, BngDiv(%lx,%lx,%lx, %lx, %lx)\n", i, r1, r2, a1, a2, a3);
-        return 1;
-      }
-  }
-
-  n = bng_leading_zero_bits(a1);
-  if (a1 == 0) {
-    if (n != BNG_BITS_PER_DIGIT) {
-      printf("Round %d, bng_leading_zero(bits(%lx) = %d", i, a1, n);
-      return 1;
-    }
-  } else {
-    if ((a1 << n) >> n != a1 ||
-        ((a1 << n) & (1L << (BNG_BITS_PER_DIGIT - 1))) == 0) {
-      printf("Round %d, bng_leading_zero(bits(%lx) = %d", i, a1, n);
-      return 1;
-    }
-  }
-  return 0;
-}
-
-#endif
-
-/* Test the bng operations.  Use BigNum as a reference. */
-
-#define MAX_DIGITS 32
-
-void randbng(bng a, bngsize n)
-{
-  int i;
-  for (i = 0; i < n; i++) a[i] = randdigit();
-}
-
-char * bng2string(bng a, bngsize n)
-{
-  char * buffer = malloc((BNG_BITS_PER_DIGIT / 4 + 1) * MAX_DIGITS);
-  char temp[BNG_BITS_PER_DIGIT / 4 + 1];
-  int i;
-
-  buffer[0] = 0;
-  for (i = n - 1; i >= 0; i--) {
-    sprintf(temp, "%lx", a[i]);
-    strcat(buffer, temp);
-    if (i > 0) strcat(buffer, "_");
-  }
-  return buffer;
-}
-
-int bngsame(bng a, bng b, bngsize n)
-{
-  int i;
-  for (i = 0; i < n; i++)
-    if (a[i] != b[i]) return 0;
-  return 1;
-}
-
-int test_bng_ops(int i)
-{
-  bngsize p, q;
-  bngdigit a[MAX_DIGITS], b[MAX_DIGITS], c[MAX_DIGITS], d[MAX_DIGITS];
-  bngdigit f[2 * MAX_DIGITS], g[2 * MAX_DIGITS], h[2 * MAX_DIGITS];
-  bngcarry ci, co, cp;
-  bngdigit dg, do_, dp;
-  int amount;
-
-  /* Determine random lengths p and q between 1 and MAX_DIGITS.
-     Ensure p >= q. */
-  p = 1 + (rand() % MAX_DIGITS);
-  q = 1 + (rand() % MAX_DIGITS);
-  if (q > p) { bngsize t = p; p = q; q = t; }
-
-  /* Randomly generate bignums a of size p, b of size q */
-  randbng(a, p);
-  randbng(b, q);
-  ci = rand() & 1;
-
-  /* comparison */
-  co = bng_compare(a, p, b, q);
-  cp = BnnCompare(a, p, b, q);
-  if (co != cp) {
-    printf("Round %d, bng_compare(%s, %ld, %s, %ld) = %d\n",
-           i, bng2string(a, p), p, bng2string(b, q), q, co);
-    return 1;
-  }
-  co = bng_compare(b, q, a, p);
-  cp = BnnCompare(b, q, a, p);
-  if (co != cp) {
-    printf("Round %d, bng_compare(%s, %ld, %s, %ld) = %d\n",
-           i, bng2string(b, q), q, bng2string(a, p), p, co);
-    return 1;
-  }
-  /* add carry */
-  bng_assign(c, a, p);
-  co = bng_add_carry(c, p, ci);
-  BnnAssign(d, a, p);
-  cp = BnnAddCarry(d, p, ci);
-  if (co != cp || !bngsame(c, d, p)) {
-    printf("Round %d, bng_add_carry(%s, %ld, %d) -> %s, %d\n",
-           i, bng2string(a, p), p, ci, bng2string(c, p), co);
-    return 1;
-  }
-  /* add */
-  bng_assign(c, a, p);
-  co = bng_add(c, p, b, q, ci);
-  BnnAssign(d, a, p);
-  cp = BnnAdd(d, p, b, q, ci);
-  if (co != cp || !bngsame(c, d, p)) {
-    printf("Round %d, bng_add(%s, %ld, %s, %ld, %d) -> %s, %d\n",
-           i, bng2string(a, p), p, bng2string(b, q), q, ci,
-           bng2string(c, p), co);
-    return 1;
-  }
-  /* sub carry */
-  bng_assign(c, a, p);
-  co = bng_sub_carry(c, p, ci);
-  BnnAssign(d, a, p);
-  cp = BnnSubtractBorrow(d, p, ci ^ 1) ^ 1;
-  if (co != cp || !bngsame(c, d, p)) {
-    printf("Round %d, bng_sub_carry(%s, %ld, %d) -> %s, %d\n",
-           i, bng2string(a, p), p, ci, bng2string(c, p), co);
-    return 1;
-  }
-  /* sub */
-  bng_assign(c, a, p);
-  co = bng_sub(c, p, b, q, ci);
-  BnnAssign(d, a, p);
-  cp = BnnSubtract(d, p, b, q, ci ^ 1) ^ 1;
-  if (co != cp || !bngsame(c, d, p)) {
-    printf("Round %d, bng_sub(%s, %ld, %s, %ld, %d) -> %s, %d\n",
-           i, bng2string(a, p), p, bng2string(b, q), q, ci,
-           bng2string(c, p), co);
-    return 1;
-  }
-  /* shift left */
-  amount = rand() % BNG_BITS_PER_DIGIT;
-  bng_assign(c, a, p);
-  do_ = bng_shift_left(c, p, amount);
-  BnnAssign(d, a, p);
-  dp = BnnShiftLeft(d, p, amount);
-  if (do_ != dp || !bngsame(c, d, p)) {
-    printf("Round %d, bng_shift_left(%s, %ld, %d) -> %s, %ld\n",
-           i, bng2string(a, p), p, amount, bng2string(c, p), do_);
-    return 1;
-  }
-  /* shift right */
-  amount = rand() % BNG_BITS_PER_DIGIT;
-  bng_assign(c, a, p);
-  do_ = bng_shift_right(c, p, amount);
-  BnnAssign(d, a, p);
-  dp = BnnShiftRight(d, p, amount);
-  if (do_ != dp || !bngsame(c, d, p)) {
-    printf("Round %d, bng_shift_right(%s, %ld, %d) -> %s, %ld\n",
-           i, bng2string(a, p), p, amount, bng2string(c, p), do_);
-    return 1;
-  }
-  /* mult_add_digit */
-  dg = randdigit();
-  if (p >= q + 1) {
-    bng_assign(c, a, p);
-    co = bng_mult_add_digit(c, p, b, q, dg);
-    BnnAssign(d, a, p);
-    cp = BnnMultiplyDigit(d, p, b, q, dg);
-    if (co != cp || !bngsame(c, d, p)) {
-      printf("Round %d, bng_mult_add_digit(%s, %ld, %s, %ld, %ld) -> %s, %d\n",
-             i, bng2string(a, p), p, bng2string(b, q), q, dg,
-             bng2string(c, p), co);
-      return 1;
-    }
-  }
-  /* mult_sub_digit */
-  dg = randdigit();
-  bng_assign(c, a, p);
-  do_ = bng_mult_add_digit(c, p, b, q, dg);
-  bng_assign(d, c, p);
-  dp = bng_mult_sub_digit(d, p, b, q, dg);
-  if (do_ != dp || !bngsame(a, d, p)) {
-    printf("Round %d, bng_mult_sub_digit(%s, %ld, %s, %ld, %ld) -> %s, %ld\n",
-           i, bng2string(c, p), p, bng2string(b, q), q, dg,
-           bng2string(d, p), dp);
-    return 1;
-  }
-  /* mult_add */
-  randbng(f, 2*p);
-  bng_assign(g, f, 2*p);
-  co = bng_mult_add(g, 2*p, a, p, b, q);
-  BnnAssign(h, f, 2*p);
-  cp = BnnMultiply(h, 2*p, a, p, b, q);
-  if (co != cp || !bngsame(g, h, 2*p)) {
-    printf("Round %d, bng_mult_add(%s, %ld, %s, %ld, %s, %ld) -> %s, %d\n",
-           i, bng2string(f, 2*p), 2*p,
-           bng2string(a, p), p,
-           bng2string(b, q), q,
-           bng2string(g, 2*p), co);
-    return 1;
-  }
-  /* square_add */
-  randbng(f, 2*p);
-  bng_assign(g, f, 2*p);
-  co = bng_square_add(g, 2*p, b, q);
-  BnnAssign(h, f, 2*p);
-  cp = BnnAdd(h, 2*p, h, 2*p);
-  cp += BnnMultiply(h, 2*p, b, q, b, q);
-  if (co != cp || !bngsame(g, h, 2*p)) {
-    printf("Round %d, bng_square_add(%s, %ld, %s, %ld) -> %s, %d\n",
-           i, bng2string(f, 2*p), 2*p,
-           bng2string(b, q), q,
-           bng2string(g, 2*p), co);
-    return 1;
-  }
-  /* div_rem_digit */
-  if (a[p - 1] < dg) {
-    do_ = bng_div_rem_digit(c, a, p, dg);
-    dp = BnnDivideDigit(d, a, p, dg);
-    if (do_ != dp || !bngsame(c, d, p-1)) {
-      printf("Round %d, bng_div_rem_digit(%s, %s, %ld, %lx) -> %lx\n",
-             i, bng2string(d, p-1), bng2string(a, p), p, dg, do_);
-      return 1;
-    }
-  }
-  /* div_rem */
-  if (p > q && a[p - 1] < b[q - 1]) {
-    bng_assign(c, a, p);
-    bng_div_rem(c, p, b, q);
-    BnnAssign(d, a, p);
-    BnnDivide(d, p, b, q);
-    if (!bngsame(c, d, p)) {
-      printf("Round %d, bng_div_rem(%s, %ld, %s, %ld) -> %s, %s\n",
-             i, bng2string(a, p), p, bng2string(b, q), q,
-             bng2string(c + q, p - q),
-             bng2string(c, q));
-      return 1;
-    }
-  }
-  return 0;
-}
-
-int main(int argc, char ** argv)
-{
-  int niter = 100000;
-  int i, err;
-
-  bng_init();
-  if (argc >= 2) niter = atoi(argv[1]);
-#if defined(ARCH_UINT64_TYPE) && !defined(ARCH_SIXTYFOUR)
-  printf("Testing single-digit operations\n");
-  for (err = 0, i = 1; i < niter; i++) err += test_digit_ops(i);
-  printf("%d rounds performed, %d errors found\n", niter, err);
-#endif
-  printf("Testing bignum operations\n");
-  for (err = 0, i = 1; i < niter; i++) err += test_bng_ops(i);
-  printf("%d rounds performed, %d errors found\n", niter, err);
-  printf("Testing bignum operations with skewed PRNG\n");
-  rand_skewed = 1;
-  for (err = 0, i = 1; i < niter; i++) err += test_bng_ops(i);
-  printf("%d rounds performed, %d errors found\n", niter, err);
-  return 0;
-}
diff -Nru jocaml-3.12.0/testsuite/interactive/lib-gc/alloc.ml jocaml-3.12.1/testsuite/interactive/lib-gc/alloc.ml
--- jocaml-3.12.0/testsuite/interactive/lib-gc/alloc.ml	2010-04-08 12:48:54.000000000 +0000
+++ jocaml-3.12.1/testsuite/interactive/lib-gc/alloc.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: alloc.ml 2553 1999-11-17 18:59:06Z xleroy $ *)
+(* $Id: alloc.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Random allocation test *)
 
diff -Nru jocaml-3.12.0/testsuite/lib/Makefile jocaml-3.12.1/testsuite/lib/Makefile
--- jocaml-3.12.0/testsuite/lib/Makefile	2010-01-25 13:47:28.000000000 +0000
+++ jocaml-3.12.1/testsuite/lib/Makefile	2011-07-07 14:32:00.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile 11113 2011-07-07 14:32:00Z maranget $
 
 compile: testing.cmi testing.cmo testing.cmx
 
diff -Nru jocaml-3.12.0/testsuite/lib/testing.ml jocaml-3.12.1/testsuite/lib/testing.ml
--- jocaml-3.12.0/testsuite/lib/testing.ml	2010-01-25 13:47:28.000000000 +0000
+++ jocaml-3.12.1/testsuite/lib/testing.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: testing.ml,v 1.1 2006/01/12 12:52:14 weis Exp $ *)
+(* $Id: testing.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Testing auxilliaries. *)
 
diff -Nru jocaml-3.12.0/testsuite/lib/testing.mli jocaml-3.12.1/testsuite/lib/testing.mli
--- jocaml-3.12.0/testsuite/lib/testing.mli	2010-01-25 13:47:28.000000000 +0000
+++ jocaml-3.12.1/testsuite/lib/testing.mli	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: testing.mli,v 1.1 2006/01/12 12:52:14 weis Exp $ *)
+(* $Id: testing.mli 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Testing auxilliaries. *)
 
diff -Nru jocaml-3.12.0/testsuite/Makefile jocaml-3.12.1/testsuite/Makefile
--- jocaml-3.12.0/testsuite/Makefile	2010-06-29 13:52:11.000000000 +0000
+++ jocaml-3.12.1/testsuite/Makefile	2011-07-07 14:32:00.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile 11113 2011-07-07 14:32:00Z maranget $
 
 BASEDIR=${PWD}
 NO_PRINT=`($(MAKE) empty --no-print-directory > /dev/null 2>&1) && echo '--no-print-directory' || echo ''`
diff -Nru jocaml-3.12.0/testsuite/makefiles/Makefile.common jocaml-3.12.1/testsuite/makefiles/Makefile.common
--- jocaml-3.12.0/testsuite/makefiles/Makefile.common	2010-05-05 09:45:49.000000000 +0000
+++ jocaml-3.12.1/testsuite/makefiles/Makefile.common	2011-07-07 14:32:00.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile.common 11113 2011-07-07 14:32:00Z maranget $
 
 TOPDIR=$(BASEDIR)/..
 
diff -Nru jocaml-3.12.0/testsuite/makefiles/Makefile.okbad jocaml-3.12.1/testsuite/makefiles/Makefile.okbad
--- jocaml-3.12.0/testsuite/makefiles/Makefile.okbad	2010-03-17 09:11:27.000000000 +0000
+++ jocaml-3.12.1/testsuite/makefiles/Makefile.okbad	2011-07-07 14:32:00.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile.okbad 11113 2011-07-07 14:32:00Z maranget $
 
 default: compile
 
diff -Nru jocaml-3.12.0/testsuite/makefiles/Makefile.one jocaml-3.12.1/testsuite/makefiles/Makefile.one
--- jocaml-3.12.0/testsuite/makefiles/Makefile.one	2010-05-04 10:37:53.000000000 +0000
+++ jocaml-3.12.1/testsuite/makefiles/Makefile.one	2011-07-07 14:32:00.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile.one 11113 2011-07-07 14:32:00Z maranget $
 
 CMI_FILES=$(MODULES:=.cmi)
 CMO_FILES=$(MODULES:=.cmo)
diff -Nru jocaml-3.12.0/testsuite/makefiles/Makefile.several jocaml-3.12.1/testsuite/makefiles/Makefile.several
--- jocaml-3.12.0/testsuite/makefiles/Makefile.several	2010-06-07 12:26:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/makefiles/Makefile.several	2011-07-07 14:32:00.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile.several 11113 2011-07-07 14:32:00Z maranget $
 
 CC=$(NATIVECC) $(NATIVECCCOMPOPTS)
 FC=$(FORTAN_COMPILER)
diff -Nru jocaml-3.12.0/testsuite/makefiles/Makefile.toplevel jocaml-3.12.1/testsuite/makefiles/Makefile.toplevel
--- jocaml-3.12.0/testsuite/makefiles/Makefile.toplevel	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/makefiles/Makefile.toplevel	2011-07-07 14:32:00.000000000 +0000
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile.toplevel 11113 2011-07-07 14:32:00Z maranget $
 
 default:
 	@for file in *.ml; do \
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/alpha.S jocaml-3.12.1/testsuite/tests/asmcomp/alpha.S
--- jocaml-3.12.0/testsuite/tests/asmcomp/alpha.S	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/alpha.S	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: alpha.S 2638 1999-11-29 19:04:56Z doligez $ */
+/* $Id: alpha.S 11113 2011-07-07 14:32:00Z maranget $ */
 
         .globl  call_gen_code
         .ent    call_gen_code
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/amd64.S jocaml-3.12.1/testsuite/tests/asmcomp/amd64.S
--- jocaml-3.12.0/testsuite/tests/asmcomp/amd64.S	2010-05-04 13:23:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/amd64.S	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: amd64.S 5634 2003-06-30 08:28:48Z xleroy $ */
+/* $Id: amd64.S 11113 2011-07-07 14:32:00Z maranget $ */
 
 #ifdef SYS_macosx
 #define ALIGN 4
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/arith.cmm jocaml-3.12.1/testsuite/tests/asmcomp/arith.cmm
--- jocaml-3.12.0/testsuite/tests/asmcomp/arith.cmm	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/arith.cmm	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: arith.cmm 3218 2000-06-29 11:45:24Z xleroy $ *)
+(* $Id: arith.cmm 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Regression test for arithmetic instructions *)
 
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/arm.S jocaml-3.12.1/testsuite/tests/asmcomp/arm.S
--- jocaml-3.12.0/testsuite/tests/asmcomp/arm.S	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/arm.S	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: arm.S 9212 2009-03-31 09:46:08Z xleroy $ */
+/* $Id: arm.S 11113 2011-07-07 14:32:00Z maranget $ */
 
         .text
 
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/checkbound.cmm jocaml-3.12.1/testsuite/tests/asmcomp/checkbound.cmm
--- jocaml-3.12.0/testsuite/tests/asmcomp/checkbound.cmm	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/checkbound.cmm	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: checkbound.cmm 2553 1999-11-17 18:59:06Z xleroy $ *)
+(* $Id: checkbound.cmm 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (function "checkbound2" (x: int y: int)
   (checkbound x y))
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/fib.cmm jocaml-3.12.1/testsuite/tests/asmcomp/fib.cmm
--- jocaml-3.12.0/testsuite/tests/asmcomp/fib.cmm	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/fib.cmm	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: fib.cmm 2553 1999-11-17 18:59:06Z xleroy $ *)
+(* $Id: fib.cmm 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (function "fib" (n: int)
   (if (< n 2)
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/hppa.S jocaml-3.12.1/testsuite/tests/asmcomp/hppa.S
--- jocaml-3.12.0/testsuite/tests/asmcomp/hppa.S	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/hppa.S	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 ;*                                                                   *
 ;*********************************************************************
 
-; $Id: hppa.S 2553 1999-11-17 18:59:06Z xleroy $
+; $Id: hppa.S 11113 2011-07-07 14:32:00Z maranget $
 ; Must be preprocessed by cpp
 
 #ifdef SYS_hpux
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/i386nt.asm jocaml-3.12.1/testsuite/tests/asmcomp/i386nt.asm
--- jocaml-3.12.0/testsuite/tests/asmcomp/i386nt.asm	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/i386nt.asm	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 ;                                                                     
 ;*********************************************************************
 
-; $Id: i386nt.asm 2553 1999-11-17 18:59:06Z xleroy $
+; $Id: i386nt.asm 11113 2011-07-07 14:32:00Z maranget $
 
 	.386
 	.MODEL FLAT
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/i386.S jocaml-3.12.1/testsuite/tests/asmcomp/i386.S
--- jocaml-3.12.0/testsuite/tests/asmcomp/i386.S	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/i386.S	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: i386.S 2553 1999-11-17 18:59:06Z xleroy $ */
+/* $Id: i386.S 11113 2011-07-07 14:32:00Z maranget $ */
 
 /* Linux with ELF binaries does not prefix identifiers with _.
    Linux with a.out binaries, FreeBSD, and NextStep do. */
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/ia64.S jocaml-3.12.1/testsuite/tests/asmcomp/ia64.S
--- jocaml-3.12.0/testsuite/tests/asmcomp/ia64.S	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/ia64.S	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: ia64.S 3573 2001-07-12 12:54:24Z doligez $ */
+/* $Id: ia64.S 11113 2011-07-07 14:32:00Z maranget $ */
 
 #define ST8OFF(a,b,d) st8 [a] = b, d
 #define LD8OFF(a,b,d) ld8 a = [b], d
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/integr.cmm jocaml-3.12.1/testsuite/tests/asmcomp/integr.cmm
--- jocaml-3.12.0/testsuite/tests/asmcomp/integr.cmm	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/integr.cmm	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: integr.cmm 3218 2000-06-29 11:45:24Z xleroy $ *)
+(* $Id: integr.cmm 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (function "square" (x: float)
    ( *f x x))
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/lexcmm.mli jocaml-3.12.1/testsuite/tests/asmcomp/lexcmm.mli
--- jocaml-3.12.0/testsuite/tests/asmcomp/lexcmm.mli	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/lexcmm.mli	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: lexcmm.mli 2553 1999-11-17 18:59:06Z xleroy $ *)
+(* $Id: lexcmm.mli 11113 2011-07-07 14:32:00Z maranget $ *)
 
 val token: Lexing.lexbuf -> Parsecmm.token
 
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/lexcmm.mll jocaml-3.12.1/testsuite/tests/asmcomp/lexcmm.mll
--- jocaml-3.12.0/testsuite/tests/asmcomp/lexcmm.mll	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/lexcmm.mll	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: lexcmm.mll 3211 2000-06-25 19:54:50Z xleroy $ *)
+(* $Id: lexcmm.mll 11113 2011-07-07 14:32:00Z maranget $ *)
 
 {
 open Parsecmm
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/m68k.S jocaml-3.12.1/testsuite/tests/asmcomp/m68k.S
--- jocaml-3.12.0/testsuite/tests/asmcomp/m68k.S	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/m68k.S	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 |*                                                                     *
 |***********************************************************************
 
-| $Id: m68k.S 2553 1999-11-17 18:59:06Z xleroy $
+| $Id: m68k.S 11113 2011-07-07 14:32:00Z maranget $
 
 | call_gen_code is used with the following types:
 |       unit -> int
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/mainarith.c jocaml-3.12.1/testsuite/tests/asmcomp/mainarith.c
--- jocaml-3.12.0/testsuite/tests/asmcomp/mainarith.c	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/mainarith.c	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: mainarith.c 9212 2009-03-31 09:46:08Z xleroy $ */
+/* $Id: mainarith.c 11113 2011-07-07 14:32:00Z maranget $ */
 
 #include <stdio.h>
 #include <math.h>
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/main.c jocaml-3.12.1/testsuite/tests/asmcomp/main.c
--- jocaml-3.12.0/testsuite/tests/asmcomp/main.c	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/main.c	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: main.c 9212 2009-03-31 09:46:08Z xleroy $ */
+/* $Id: main.c 11113 2011-07-07 14:32:00Z maranget $ */
 
 #include <stddef.h>
 #include <stdio.h>
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/main.ml jocaml-3.12.1/testsuite/tests/asmcomp/main.ml
--- jocaml-3.12.0/testsuite/tests/asmcomp/main.ml	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/main.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: main.ml 3229 2000-07-07 14:09:23Z xleroy $ *)
+(* $Id: main.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 open Clflags
 
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/mips.s jocaml-3.12.1/testsuite/tests/asmcomp/mips.s
--- jocaml-3.12.0/testsuite/tests/asmcomp/mips.s	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/mips.s	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: mips.s 2638 1999-11-29 19:04:56Z doligez $ */
+/* $Id: mips.s 11113 2011-07-07 14:32:00Z maranget $ */
 
         .globl  call_gen_code
         .ent    call_gen_code
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/parsecmmaux.ml jocaml-3.12.1/testsuite/tests/asmcomp/parsecmmaux.ml
--- jocaml-3.12.0/testsuite/tests/asmcomp/parsecmmaux.ml	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/parsecmmaux.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: parsecmmaux.ml 2553 1999-11-17 18:59:06Z xleroy $ *)
+(* $Id: parsecmmaux.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Auxiliary functions for parsing *)
 
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/parsecmmaux.mli jocaml-3.12.1/testsuite/tests/asmcomp/parsecmmaux.mli
--- jocaml-3.12.0/testsuite/tests/asmcomp/parsecmmaux.mli	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/parsecmmaux.mli	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: parsecmmaux.mli 2553 1999-11-17 18:59:06Z xleroy $ *)
+(* $Id: parsecmmaux.mli 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Auxiliary functions for parsing *)
 
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/parsecmm.mly jocaml-3.12.1/testsuite/tests/asmcomp/parsecmm.mly
--- jocaml-3.12.0/testsuite/tests/asmcomp/parsecmm.mly	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/parsecmm.mly	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: parsecmm.mly 9212 2009-03-31 09:46:08Z xleroy $ */
+/* $Id: parsecmm.mly 11113 2011-07-07 14:32:00Z maranget $ */
 
 /* A simple parser for C-- */
 
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/power-aix.S jocaml-3.12.1/testsuite/tests/asmcomp/power-aix.S
--- jocaml-3.12.0/testsuite/tests/asmcomp/power-aix.S	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/power-aix.S	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 #*                                                                   *
 #*********************************************************************
 
-# $Id: power-aix.S 3042 2000-04-05 18:30:22Z doligez $
+# $Id: power-aix.S 11113 2011-07-07 14:32:00Z maranget $
 
         .csect  .text[PR]
 
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/power-elf.S jocaml-3.12.1/testsuite/tests/asmcomp/power-elf.S
--- jocaml-3.12.0/testsuite/tests/asmcomp/power-elf.S	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/power-elf.S	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 /*                                                                   */
 /*********************************************************************/
 
-/* $Id: power-elf.S 2553 1999-11-17 18:59:06Z xleroy $ */
+/* $Id: power-elf.S 11113 2011-07-07 14:32:00Z maranget $ */
 
 /* Save and restore all callee-save registers */
 /* GPR 14 at sp+16 ... GPR 31 at sp+84
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/power-rhapsody.S jocaml-3.12.1/testsuite/tests/asmcomp/power-rhapsody.S
--- jocaml-3.12.0/testsuite/tests/asmcomp/power-rhapsody.S	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/power-rhapsody.S	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 /*                                                                   */
 /*********************************************************************/
 
-/* $Id: power-rhapsody.S 2553 1999-11-17 18:59:06Z xleroy $ */
+/* $Id: power-rhapsody.S 11113 2011-07-07 14:32:00Z maranget $ */
 
 /* Save and restore all callee-save registers */
 /* GPR 14 at sp+16 ... GPR 31 at sp+84
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/quicksort2.cmm jocaml-3.12.1/testsuite/tests/asmcomp/quicksort2.cmm
--- jocaml-3.12.0/testsuite/tests/asmcomp/quicksort2.cmm	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/quicksort2.cmm	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: quicksort2.cmm 3218 2000-06-29 11:45:24Z xleroy $ *)
+(* $Id: quicksort2.cmm 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (function "cmp" (i: int j: int)
   (- i j))
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/quicksort.cmm jocaml-3.12.1/testsuite/tests/asmcomp/quicksort.cmm
--- jocaml-3.12.0/testsuite/tests/asmcomp/quicksort.cmm	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/quicksort.cmm	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: quicksort.cmm 3211 2000-06-25 19:54:50Z xleroy $ *)
+(* $Id: quicksort.cmm 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (function "quicksort" (lo: int hi: int a: addr)
   (if (< lo hi)
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/soli.cmm jocaml-3.12.1/testsuite/tests/asmcomp/soli.cmm
--- jocaml-3.12.0/testsuite/tests/asmcomp/soli.cmm	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/soli.cmm	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: soli.cmm 5634 2003-06-30 08:28:48Z xleroy $ *)
+(* $Id: soli.cmm 11113 2011-07-07 14:32:00Z maranget $ *)
 
 ("d1": int 0 int 1
  "d2": int 1 int 0
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/sparc.S jocaml-3.12.1/testsuite/tests/asmcomp/sparc.S
--- jocaml-3.12.0/testsuite/tests/asmcomp/sparc.S	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/sparc.S	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: sparc.S 2553 1999-11-17 18:59:06Z xleroy $ */
+/* $Id: sparc.S 11113 2011-07-07 14:32:00Z maranget $ */
 
 #ifndef SYS_solaris
 #define Call_gen_code _call_gen_code
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/.svnignore jocaml-3.12.1/testsuite/tests/asmcomp/.svnignore
--- jocaml-3.12.0/testsuite/tests/asmcomp/.svnignore	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/.svnignore	2011-07-07 14:32:00.000000000 +0000
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+svn propset svn:ignore -F - . <<EOF
+
+*.result
+*.byte
+*.native
+program
+*.s
+*.out
+*.dSYM
+parsecmm.mli
+parsecmm.ml
+lexcmm.ml
+codegen
+
+EOF
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/tagged-fib.cmm jocaml-3.12.1/testsuite/tests/asmcomp/tagged-fib.cmm
--- jocaml-3.12.0/testsuite/tests/asmcomp/tagged-fib.cmm	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/tagged-fib.cmm	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: tagged-fib.cmm 2553 1999-11-17 18:59:06Z xleroy $ *)
+(* $Id: tagged-fib.cmm 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (function "fib" (n: int)
   (if (< n 5)
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/tagged-integr.cmm jocaml-3.12.1/testsuite/tests/asmcomp/tagged-integr.cmm
--- jocaml-3.12.0/testsuite/tests/asmcomp/tagged-integr.cmm	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/tagged-integr.cmm	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: tagged-integr.cmm 3229 2000-07-07 14:09:23Z xleroy $ *)
+(* $Id: tagged-integr.cmm 11113 2011-07-07 14:32:00Z maranget $ *)
 
 ("res_square": skip 8)
 ("h": skip 8)
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/tagged-quicksort.cmm jocaml-3.12.1/testsuite/tests/asmcomp/tagged-quicksort.cmm
--- jocaml-3.12.0/testsuite/tests/asmcomp/tagged-quicksort.cmm	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/tagged-quicksort.cmm	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: tagged-quicksort.cmm 3218 2000-06-29 11:45:24Z xleroy $ *)
+(* $Id: tagged-quicksort.cmm 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (function "quick" (lo: int hi: int a: addr)
   (if (< lo hi)
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/tagged-tak.cmm jocaml-3.12.1/testsuite/tests/asmcomp/tagged-tak.cmm
--- jocaml-3.12.0/testsuite/tests/asmcomp/tagged-tak.cmm	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/tagged-tak.cmm	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: tagged-tak.cmm 3229 2000-07-07 14:09:23Z xleroy $ *)
+(* $Id: tagged-tak.cmm 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (function "tak" (x:int y:int z:int)
   (if (> x y)
diff -Nru jocaml-3.12.0/testsuite/tests/asmcomp/tak.cmm jocaml-3.12.1/testsuite/tests/asmcomp/tak.cmm
--- jocaml-3.12.0/testsuite/tests/asmcomp/tak.cmm	2010-04-07 10:15:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/asmcomp/tak.cmm	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: tak.cmm 3211 2000-06-25 19:54:50Z xleroy $ *)
+(* $Id: tak.cmm 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (function "tak" (x:int y:int z:int)
   (if (> x y)
diff -Nru jocaml-3.12.0/testsuite/tests/basic/maps.ml jocaml-3.12.1/testsuite/tests/basic/maps.ml
--- jocaml-3.12.0/testsuite/tests/basic/maps.ml	2010-05-25 13:29:43.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/basic/maps.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: sets.ml 5183 2002-10-16 09:06:39Z weis $ *)
+(* $Id: maps.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 module IntMap = Map.Make(struct type t = int let compare x y = x-y end)
 
diff -Nru jocaml-3.12.0/testsuite/tests/basic/sets.ml jocaml-3.12.1/testsuite/tests/basic/sets.ml
--- jocaml-3.12.0/testsuite/tests/basic/sets.ml	2010-01-25 13:54:39.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/basic/sets.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: sets.ml 5183 2002-10-16 09:06:39Z weis $ *)
+(* $Id: sets.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 module IntSet = Set.Make(struct type t = int let compare x y = x-y end)
 
diff -Nru jocaml-3.12.0/testsuite/tests/basic-more/tformat.ml jocaml-3.12.1/testsuite/tests/basic-more/tformat.ml
--- jocaml-3.12.0/testsuite/tests/basic-more/tformat.ml	2010-01-25 14:30:09.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/basic-more/tformat.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                       *)
 (*************************************************************************)
 
-(* $Id: tformat.ml 9270 2009-05-20 11:52:42Z doligez $
+(* $Id: tformat.ml 11113 2011-07-07 14:32:00Z maranget $
 
 A testbed file for the module Format.
 
diff -Nru jocaml-3.12.0/testsuite/tests/basic-private/length.ml jocaml-3.12.1/testsuite/tests/basic-private/length.ml
--- jocaml-3.12.0/testsuite/tests/basic-private/length.ml	2010-01-25 14:33:51.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/basic-private/length.ml	2011-07-07 14:32:00.000000000 +0000
@@ -1,4 +1,4 @@
-(* $Id: length.ml 8482 2007-11-06 21:06:18Z weis $
+(* $Id: length.ml 11113 2011-07-07 14:32:00Z maranget $
 
 A testbed file for private type abbreviation definitions.
 
diff -Nru jocaml-3.12.0/testsuite/tests/basic-private/length.mli jocaml-3.12.1/testsuite/tests/basic-private/length.mli
--- jocaml-3.12.0/testsuite/tests/basic-private/length.mli	2010-01-25 14:33:51.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/basic-private/length.mli	2011-07-07 14:32:00.000000000 +0000
@@ -1,4 +1,4 @@
-(* $Id: length.mli 8482 2007-11-06 21:06:18Z weis $
+(* $Id: length.mli 11113 2011-07-07 14:32:00Z maranget $
 
 A testbed file for private type abbreviation definitions.
 
diff -Nru jocaml-3.12.0/testsuite/tests/basic-private/tlength.ml jocaml-3.12.1/testsuite/tests/basic-private/tlength.ml
--- jocaml-3.12.0/testsuite/tests/basic-private/tlength.ml	2010-01-25 14:33:51.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/basic-private/tlength.ml	2011-07-07 14:32:00.000000000 +0000
@@ -1,4 +1,4 @@
-(* $Id: tlength.ml 8482 2007-11-06 21:06:18Z weis $
+(* $Id: tlength.ml 11113 2011-07-07 14:32:00Z maranget $
 
 A testbed file for private type abbreviation definitions.
 
diff -Nru jocaml-3.12.0/testsuite/tests/embedded/.svnignore jocaml-3.12.1/testsuite/tests/embedded/.svnignore
--- jocaml-3.12.0/testsuite/tests/embedded/.svnignore	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/embedded/.svnignore	2011-07-07 14:32:00.000000000 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+svn propset svn:ignore -F - . <<EOF
+
+*.result
+*.byte
+*.native
+program
+
+EOF
diff -Nru jocaml-3.12.0/testsuite/tests/gc-roots/.svnignore jocaml-3.12.1/testsuite/tests/gc-roots/.svnignore
--- jocaml-3.12.0/testsuite/tests/gc-roots/.svnignore	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/gc-roots/.svnignore	2011-07-07 14:32:00.000000000 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+svn propset svn:ignore -F - . <<EOF
+
+*.result
+*.byte
+*.native
+program
+
+EOF
diff -Nru jocaml-3.12.0/testsuite/tests/lib-bigarray/fftba.ml jocaml-3.12.1/testsuite/tests/lib-bigarray/fftba.ml
--- jocaml-3.12.0/testsuite/tests/lib-bigarray/fftba.ml	2010-01-25 14:01:33.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/lib-bigarray/fftba.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: fftba.ml 2938 2000-03-10 14:54:41Z xleroy $ *)
+(* $Id: fftba.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 open Bigarray
 
diff -Nru jocaml-3.12.0/testsuite/tests/lib-bigarray/pr5115.ml jocaml-3.12.1/testsuite/tests/lib-bigarray/pr5115.ml
--- jocaml-3.12.0/testsuite/tests/lib-bigarray/pr5115.ml	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/lib-bigarray/pr5115.ml	2011-07-07 14:32:00.000000000 +0000
@@ -0,0 +1,13 @@
+(* PR#5115 - multiple evaluation of bigarray expr *)
+
+open Bigarray
+
+let f y0 =
+  Printf.printf "***EXEC***\n%!";
+  y0
+
+let _ =
+  let y = Array1.of_array float64 fortran_layout [| 1. |] in
+  (f y).{1};
+  (f y).{1} <- 3.14
+
diff -Nru jocaml-3.12.0/testsuite/tests/lib-bigarray/pr5115.reference jocaml-3.12.1/testsuite/tests/lib-bigarray/pr5115.reference
--- jocaml-3.12.0/testsuite/tests/lib-bigarray/pr5115.reference	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/lib-bigarray/pr5115.reference	2011-07-07 14:32:00.000000000 +0000
@@ -0,0 +1,2 @@
+***EXEC***
+***EXEC***
diff -Nru jocaml-3.12.0/testsuite/tests/lib-digest/.svnignore jocaml-3.12.1/testsuite/tests/lib-digest/.svnignore
--- jocaml-3.12.0/testsuite/tests/lib-digest/.svnignore	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/lib-digest/.svnignore	2011-07-07 14:32:00.000000000 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+svn propset svn:ignore -F - . <<EOF
+
+*.result
+*.byte
+*.native
+program
+
+EOF
diff -Nru jocaml-3.12.0/testsuite/tests/lib-dynlink-bytecode/.svnignore jocaml-3.12.1/testsuite/tests/lib-dynlink-bytecode/.svnignore
--- jocaml-3.12.0/testsuite/tests/lib-dynlink-bytecode/.svnignore	2010-02-09 14:44:19.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/lib-dynlink-bytecode/.svnignore	2011-07-07 14:32:00.000000000 +0000
@@ -1,6 +1,15 @@
+#!/bin/sh
+
+svn propset svn:ignore -F - . <<EOF
+
+*.result
+*.byte
+*.native
+program
 main
 static
 custom
 *.a
 *.so
-*.result
+
+EOF
diff -Nru jocaml-3.12.0/testsuite/tests/lib-dynlink-native/.svnignore jocaml-3.12.1/testsuite/tests/lib-dynlink-native/.svnignore
--- jocaml-3.12.0/testsuite/tests/lib-dynlink-native/.svnignore	2010-02-09 14:44:19.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/lib-dynlink-native/.svnignore	2011-07-07 14:32:00.000000000 +0000
@@ -1,5 +1,15 @@
+#!/bin/sh
+
+svn propset svn:ignore -F - . <<EOF
+
+*.result
+*.byte
+*.native
+program
 mypack.pack.s
 result
 main
 *.so
 *.a
+
+EOF
diff -Nru jocaml-3.12.0/testsuite/tests/lib-scanf/tscanf.ml jocaml-3.12.1/testsuite/tests/lib-scanf/tscanf.ml
--- jocaml-3.12.0/testsuite/tests/lib-scanf/tscanf.ml	2010-05-02 18:21:57.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/lib-scanf/tscanf.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                       *)
 (*************************************************************************)
 
-(* $Id: tscanf.ml 9306 2009-07-03 08:36:54Z weis $
+(* $Id: tscanf.ml 11113 2011-07-07 14:32:00Z maranget $
 
 A testbed file for the module Scanf.
 
diff -Nru jocaml-3.12.0/testsuite/tests/misc/bdd.ml jocaml-3.12.1/testsuite/tests/misc/bdd.ml
--- jocaml-3.12.0/testsuite/tests/misc/bdd.ml	2010-01-25 14:09:53.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc/bdd.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: bdd.ml 7017 2005-08-12 09:22:04Z xleroy $ *)
+(* $Id: bdd.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Translated to Caml by Xavier Leroy *)
 (* Original code written in SML by ... *)
diff -Nru jocaml-3.12.0/testsuite/tests/misc/boyer.ml jocaml-3.12.1/testsuite/tests/misc/boyer.ml
--- jocaml-3.12.0/testsuite/tests/misc/boyer.ml	2010-01-25 14:09:53.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc/boyer.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: boyer.ml 7017 2005-08-12 09:22:04Z xleroy $ *)
+(* $Id: boyer.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Manipulations over terms *)
 
diff -Nru jocaml-3.12.0/testsuite/tests/misc/fib.ml jocaml-3.12.1/testsuite/tests/misc/fib.ml
--- jocaml-3.12.0/testsuite/tests/misc/fib.ml	2010-01-25 14:09:53.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc/fib.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: fib.ml 7017 2005-08-12 09:22:04Z xleroy $ *)
+(* $Id: fib.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 let rec fib n =
   if n < 2 then 1 else fib(n-1) + fib(n-2)
diff -Nru jocaml-3.12.0/testsuite/tests/misc/hamming.ml jocaml-3.12.1/testsuite/tests/misc/hamming.ml
--- jocaml-3.12.0/testsuite/tests/misc/hamming.ml	2010-01-25 14:09:53.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc/hamming.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: hamming.ml 4303 2002-01-23 17:50:20Z doligez $ *)
+(* $Id: hamming.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* We cannot use bignums because we don't do custom runtimes, but
    int64 is a bit short, so we roll our own 37-digit numbers...
diff -Nru jocaml-3.12.0/testsuite/tests/misc/nucleic.ml jocaml-3.12.1/testsuite/tests/misc/nucleic.ml
--- jocaml-3.12.0/testsuite/tests/misc/nucleic.ml	2010-01-25 14:09:53.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc/nucleic.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: nucleic.ml 7017 2005-08-12 09:22:04Z xleroy $ *)
+(* $Id: nucleic.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Use floating-point arithmetic *)
 
diff -Nru jocaml-3.12.0/testsuite/tests/misc/sieve.ml jocaml-3.12.1/testsuite/tests/misc/sieve.ml
--- jocaml-3.12.0/testsuite/tests/misc/sieve.ml	2010-01-25 14:09:53.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc/sieve.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: sieve.ml 7017 2005-08-12 09:22:04Z xleroy $ *)
+(* $Id: sieve.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Eratosthene's sieve *)
 
diff -Nru jocaml-3.12.0/testsuite/tests/misc/sorts.ml jocaml-3.12.1/testsuite/tests/misc/sorts.ml
--- jocaml-3.12.0/testsuite/tests/misc/sorts.ml	2010-01-25 14:09:53.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc/sorts.ml	2011-07-07 14:32:00.000000000 +0000
@@ -4476,4 +4476,4 @@
 
 if not !Sys.interactive then Printexc.catch main ();;
 
-(* $Id: sorts.ml 4955 2002-06-26 14:55:37Z doligez $ *)
+(* $Id: sorts.ml 11113 2011-07-07 14:32:00Z maranget $ *)
diff -Nru jocaml-3.12.0/testsuite/tests/misc/takc.ml jocaml-3.12.1/testsuite/tests/misc/takc.ml
--- jocaml-3.12.0/testsuite/tests/misc/takc.ml	2010-01-25 14:09:53.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc/takc.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: takc.ml 7017 2005-08-12 09:22:04Z xleroy $ *)
+(* $Id: takc.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 let rec tak x y z =
   if x > y then tak (tak (x-1) y z) (tak (y-1) z x) (tak (z-1) x y)
diff -Nru jocaml-3.12.0/testsuite/tests/misc/taku.ml jocaml-3.12.1/testsuite/tests/misc/taku.ml
--- jocaml-3.12.0/testsuite/tests/misc/taku.ml	2010-01-25 14:09:53.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc/taku.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: taku.ml 7017 2005-08-12 09:22:04Z xleroy $ *)
+(* $Id: taku.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 let rec tak (x, y, z) =
   if x > y then tak(tak (x-1, y, z), tak (y-1, z, x), tak (z-1, x, y))
diff -Nru jocaml-3.12.0/testsuite/tests/misc/weaktest.ml jocaml-3.12.1/testsuite/tests/misc/weaktest.ml
--- jocaml-3.12.0/testsuite/tests/misc/weaktest.ml	2010-01-25 14:09:53.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc/weaktest.ml	2011-07-07 14:32:00.000000000 +0000
@@ -1,4 +1,4 @@
-(* $Id: weaktest.ml 8766 2008-01-11 11:55:36Z doligez $ *)
+(* $Id: weaktest.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 let debug = false;;
 
diff -Nru jocaml-3.12.0/testsuite/tests/misc-kb/equations.ml jocaml-3.12.1/testsuite/tests/misc-kb/equations.ml
--- jocaml-3.12.0/testsuite/tests/misc-kb/equations.ml	2010-01-25 14:14:49.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc-kb/equations.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: equations.ml 2553 1999-11-17 18:59:06Z xleroy $ *)
+(* $Id: equations.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (****************** Equation manipulations *************)
 
diff -Nru jocaml-3.12.0/testsuite/tests/misc-kb/equations.mli jocaml-3.12.1/testsuite/tests/misc-kb/equations.mli
--- jocaml-3.12.0/testsuite/tests/misc-kb/equations.mli	2010-01-25 14:14:49.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc-kb/equations.mli	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: equations.mli 2553 1999-11-17 18:59:06Z xleroy $ *)
+(* $Id: equations.mli 11113 2011-07-07 14:32:00Z maranget $ *)
 
 open Terms
 
diff -Nru jocaml-3.12.0/testsuite/tests/misc-kb/kbmain.ml jocaml-3.12.1/testsuite/tests/misc-kb/kbmain.ml
--- jocaml-3.12.0/testsuite/tests/misc-kb/kbmain.ml	2010-01-25 14:14:49.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc-kb/kbmain.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: kbmain.ml 7017 2005-08-12 09:22:04Z xleroy $ *)
+(* $Id: kbmain.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 open Terms
 open Equations
diff -Nru jocaml-3.12.0/testsuite/tests/misc-kb/kb.ml jocaml-3.12.1/testsuite/tests/misc-kb/kb.ml
--- jocaml-3.12.0/testsuite/tests/misc-kb/kb.ml	2010-01-25 14:14:49.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc-kb/kb.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: kb.ml 2553 1999-11-17 18:59:06Z xleroy $ *)
+(* $Id: kb.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 open Terms
 open Equations
diff -Nru jocaml-3.12.0/testsuite/tests/misc-kb/kb.mli jocaml-3.12.1/testsuite/tests/misc-kb/kb.mli
--- jocaml-3.12.0/testsuite/tests/misc-kb/kb.mli	2010-01-25 14:14:49.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc-kb/kb.mli	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: kb.mli 2553 1999-11-17 18:59:06Z xleroy $ *)
+(* $Id: kb.mli 11113 2011-07-07 14:32:00Z maranget $ *)
 
 open Terms
 open Equations
diff -Nru jocaml-3.12.0/testsuite/tests/misc-kb/orderings.ml jocaml-3.12.1/testsuite/tests/misc-kb/orderings.ml
--- jocaml-3.12.0/testsuite/tests/misc-kb/orderings.ml	2010-01-25 14:14:49.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc-kb/orderings.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: orderings.ml 2553 1999-11-17 18:59:06Z xleroy $ *)
+(* $Id: orderings.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (*********************** Recursive Path Ordering ****************************)
 
diff -Nru jocaml-3.12.0/testsuite/tests/misc-kb/orderings.mli jocaml-3.12.1/testsuite/tests/misc-kb/orderings.mli
--- jocaml-3.12.0/testsuite/tests/misc-kb/orderings.mli	2010-01-25 14:14:49.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc-kb/orderings.mli	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: orderings.mli 2553 1999-11-17 18:59:06Z xleroy $ *)
+(* $Id: orderings.mli 11113 2011-07-07 14:32:00Z maranget $ *)
 
 open Terms
 
diff -Nru jocaml-3.12.0/testsuite/tests/misc-kb/terms.ml jocaml-3.12.1/testsuite/tests/misc-kb/terms.ml
--- jocaml-3.12.0/testsuite/tests/misc-kb/terms.ml	2010-01-25 14:14:49.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc-kb/terms.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: terms.ml 2553 1999-11-17 18:59:06Z xleroy $ *)
+(* $Id: terms.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (****************** Term manipulations *****************)
 
diff -Nru jocaml-3.12.0/testsuite/tests/misc-kb/terms.mli jocaml-3.12.1/testsuite/tests/misc-kb/terms.mli
--- jocaml-3.12.0/testsuite/tests/misc-kb/terms.mli	2010-01-25 14:14:49.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc-kb/terms.mli	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: terms.mli 2553 1999-11-17 18:59:06Z xleroy $ *)
+(* $Id: terms.mli 11113 2011-07-07 14:32:00Z maranget $ *)
 
 type term = 
     Var of int
diff -Nru jocaml-3.12.0/testsuite/tests/misc-unsafe/fft.ml jocaml-3.12.1/testsuite/tests/misc-unsafe/fft.ml
--- jocaml-3.12.0/testsuite/tests/misc-unsafe/fft.ml	2010-01-25 14:11:33.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc-unsafe/fft.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: fft.ml 7017 2005-08-12 09:22:04Z xleroy $ *)
+(* $Id: fft.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 let pi = 3.14159265358979323846
 
diff -Nru jocaml-3.12.0/testsuite/tests/misc-unsafe/quicksort.ml jocaml-3.12.1/testsuite/tests/misc-unsafe/quicksort.ml
--- jocaml-3.12.0/testsuite/tests/misc-unsafe/quicksort.ml	2010-01-25 14:11:33.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc-unsafe/quicksort.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: quicksort.ml 7017 2005-08-12 09:22:04Z xleroy $ *)
+(* $Id: quicksort.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Good test for loops. Best compiled with -unsafe. *)
 
diff -Nru jocaml-3.12.0/testsuite/tests/misc-unsafe/soli.ml jocaml-3.12.1/testsuite/tests/misc-unsafe/soli.ml
--- jocaml-3.12.0/testsuite/tests/misc-unsafe/soli.ml	2010-01-25 14:11:33.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/misc-unsafe/soli.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: soli.ml 2553 1999-11-17 18:59:06Z xleroy $ *)
+(* $Id: soli.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 
 type peg = Out | Empty | Peg
diff -Nru jocaml-3.12.0/testsuite/tests/regression-camlp4-class-type-plus/camlp4_class_type_plus_ok.ml jocaml-3.12.1/testsuite/tests/regression-camlp4-class-type-plus/camlp4_class_type_plus_ok.ml
--- jocaml-3.12.0/testsuite/tests/regression-camlp4-class-type-plus/camlp4_class_type_plus_ok.ml	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/regression-camlp4-class-type-plus/camlp4_class_type_plus_ok.ml	2011-06-10 17:39:11.000000000 +0000
@@ -0,0 +1,9 @@
+type t;;
+type xdr_value;;
+
+class type [ 't ] engine = object
+end;;
+
+module type T = sig
+class unbound_async_call : t -> [xdr_value] engine;;
+end;;
diff -Nru jocaml-3.12.0/testsuite/tests/regression-camlp4-class-type-plus/Makefile jocaml-3.12.1/testsuite/tests/regression-camlp4-class-type-plus/Makefile
--- jocaml-3.12.0/testsuite/tests/regression-camlp4-class-type-plus/Makefile	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/regression-camlp4-class-type-plus/Makefile	2011-06-10 17:39:11.000000000 +0000
@@ -0,0 +1,5 @@
+ADD_COMPFLAGS = -pp 'camlp4o'
+MAIN_MODULE = camlp4_class_type_plus_ok
+
+include ../../makefiles/Makefile.okbad
+include ../../makefiles/Makefile.common
diff -Nru jocaml-3.12.0/testsuite/tests/regression-pr5080-notes/Makefile jocaml-3.12.1/testsuite/tests/regression-pr5080-notes/Makefile
--- jocaml-3.12.0/testsuite/tests/regression-pr5080-notes/Makefile	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/regression-pr5080-notes/Makefile	2011-06-10 17:39:11.000000000 +0000
@@ -0,0 +1,5 @@
+ADD_COMPFLAGS = -pp 'camlp4o pa_macro.cmo'
+MAIN_MODULE = pr5080_notes_ok
+
+include ../../makefiles/Makefile.okbad
+include ../../makefiles/Makefile.common
diff -Nru jocaml-3.12.0/testsuite/tests/regression-pr5080-notes/pr5080_notes_ok.ml jocaml-3.12.1/testsuite/tests/regression-pr5080-notes/pr5080_notes_ok.ml
--- jocaml-3.12.0/testsuite/tests/regression-pr5080-notes/pr5080_notes_ok.ml	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/regression-pr5080-notes/pr5080_notes_ok.ml	2011-06-10 17:39:11.000000000 +0000
@@ -0,0 +1,4 @@
+let marshal_int f  =
+  match [] with
+  | _ :: `INT n :: _ -> f n
+  | _ -> failwith "marshal_int"
diff -Nru jocaml-3.12.0/testsuite/tests/runtime-errors/.svnignore jocaml-3.12.1/testsuite/tests/runtime-errors/.svnignore
--- jocaml-3.12.0/testsuite/tests/runtime-errors/.svnignore	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/runtime-errors/.svnignore	2011-07-07 14:32:00.000000000 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+svn propset svn:ignore -F - . <<EOF
+
+*.result
+*.byte
+*.native
+program
+*.bytecode
+
+EOF
diff -Nru jocaml-3.12.0/testsuite/tests/tool-lexyacc/gram_aux.ml jocaml-3.12.1/testsuite/tests/tool-lexyacc/gram_aux.ml
--- jocaml-3.12.0/testsuite/tests/tool-lexyacc/gram_aux.ml	2010-01-25 14:20:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/tool-lexyacc/gram_aux.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: gram_aux.ml,v 1.4 1999/11/17 18:58:38 xleroy Exp $ *)
+(* $Id: gram_aux.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Auxiliaries for the parser. *)
 
diff -Nru jocaml-3.12.0/testsuite/tests/tool-lexyacc/grammar.mly jocaml-3.12.1/testsuite/tests/tool-lexyacc/grammar.mly
--- jocaml-3.12.0/testsuite/tests/tool-lexyacc/grammar.mly	2010-01-25 14:20:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/tool-lexyacc/grammar.mly	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 /*                                                                     */
 /***********************************************************************/
 
-/* $Id: grammar.mly,v 1.4 1999/11/17 18:58:38 xleroy Exp $ */
+/* $Id: grammar.mly 11113 2011-07-07 14:32:00Z maranget $ */
 
 /* The grammar for lexer definitions */
 
diff -Nru jocaml-3.12.0/testsuite/tests/tool-lexyacc/input jocaml-3.12.1/testsuite/tests/tool-lexyacc/input
--- jocaml-3.12.0/testsuite/tests/tool-lexyacc/input	2010-01-25 14:20:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/tool-lexyacc/input	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: scanner.mll,v 1.5 1999/11/17 18:58:39 xleroy Exp $ *)
+(* $Id: input 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* The lexical analyzer for lexer definitions. *)
 
diff -Nru jocaml-3.12.0/testsuite/tests/tool-lexyacc/lexgen.ml jocaml-3.12.1/testsuite/tests/tool-lexyacc/lexgen.ml
--- jocaml-3.12.0/testsuite/tests/tool-lexyacc/lexgen.ml	2010-01-25 14:20:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/tool-lexyacc/lexgen.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: lexgen.ml,v 1.5 2000/12/28 13:06:39 weis Exp $ *)
+(* $Id: lexgen.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Compiling a lexer definition *)
 
diff -Nru jocaml-3.12.0/testsuite/tests/tool-lexyacc/main.ml jocaml-3.12.1/testsuite/tests/tool-lexyacc/main.ml
--- jocaml-3.12.0/testsuite/tests/tool-lexyacc/main.ml	2010-01-25 14:20:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/tool-lexyacc/main.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: main.ml,v 1.4 1999/11/17 18:58:39 xleroy Exp $ *)
+(* $Id: main.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* The lexer generator. Command-line parsing. *)
 
diff -Nru jocaml-3.12.0/testsuite/tests/tool-lexyacc/output.ml jocaml-3.12.1/testsuite/tests/tool-lexyacc/output.ml
--- jocaml-3.12.0/testsuite/tests/tool-lexyacc/output.ml	2010-01-25 14:20:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/tool-lexyacc/output.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: output.ml,v 1.5 2000/12/28 13:06:41 weis Exp $ *)
+(* $Id: output.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Generating a DFA as a set of mutually recursive functions *)
 
diff -Nru jocaml-3.12.0/testsuite/tests/tool-lexyacc/scan_aux.ml jocaml-3.12.1/testsuite/tests/tool-lexyacc/scan_aux.ml
--- jocaml-3.12.0/testsuite/tests/tool-lexyacc/scan_aux.ml	2010-01-25 14:20:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/tool-lexyacc/scan_aux.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: scan_aux.ml,v 1.4 1999/11/17 18:58:39 xleroy Exp $ *)
+(* $Id: scan_aux.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Auxiliaries for the lexical analyzer *)
 
diff -Nru jocaml-3.12.0/testsuite/tests/tool-lexyacc/scanner.mll jocaml-3.12.1/testsuite/tests/tool-lexyacc/scanner.mll
--- jocaml-3.12.0/testsuite/tests/tool-lexyacc/scanner.mll	2010-01-25 14:20:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/tool-lexyacc/scanner.mll	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: scanner.mll,v 1.5 1999/11/17 18:58:39 xleroy Exp $ *)
+(* $Id: scanner.mll 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* The lexical analyzer for lexer definitions. *)
 
diff -Nru jocaml-3.12.0/testsuite/tests/tool-lexyacc/.svnignore jocaml-3.12.1/testsuite/tests/tool-lexyacc/.svnignore
--- jocaml-3.12.0/testsuite/tests/tool-lexyacc/.svnignore	2010-02-09 14:44:19.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/tool-lexyacc/.svnignore	2011-07-07 14:32:00.000000000 +0000
@@ -1,6 +1,13 @@
+#!/bin/sh
+
+svn propset svn:ignore -F - . <<EOF
+
+*.result
+*.byte
+*.native
+program
 scanner.ml
 grammar.mli
 grammar.ml
-*.byte
-*.native
-*.result
+
+EOF
diff -Nru jocaml-3.12.0/testsuite/tests/tool-lexyacc/syntax.ml jocaml-3.12.1/testsuite/tests/tool-lexyacc/syntax.ml
--- jocaml-3.12.0/testsuite/tests/tool-lexyacc/syntax.ml	2010-01-25 14:20:30.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/tool-lexyacc/syntax.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: syntax.ml,v 1.4 1999/11/17 18:58:39 xleroy Exp $ *)
+(* $Id: syntax.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* The shallow abstract syntax *)
 
diff -Nru jocaml-3.12.0/testsuite/tests/tool-ocaml/lib.ml jocaml-3.12.1/testsuite/tests/tool-ocaml/lib.ml
--- jocaml-3.12.0/testsuite/tests/tool-ocaml/lib.ml	2010-01-25 14:23:07.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/tool-ocaml/lib.ml	2011-07-07 14:32:00.000000000 +0000
@@ -1,4 +1,4 @@
-(* file $Id: lib.ml 6190 2004-04-06 09:11:45Z starynke $ *)
+(* file $Id: lib.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 external raise : exn -> 'a = "%raise"
 
@@ -43,4 +43,4 @@
 
 let x = 42;;
 
-(* eof $Id: lib.ml 6190 2004-04-06 09:11:45Z starynke $ *)
+(* eof $Id: lib.ml 11113 2011-07-07 14:32:00Z maranget $ *)
diff -Nru jocaml-3.12.0/testsuite/tests/tool-ocaml/t301-object.ml jocaml-3.12.1/testsuite/tests/tool-ocaml/t301-object.ml
--- jocaml-3.12.0/testsuite/tests/tool-ocaml/t301-object.ml	2010-01-25 14:23:07.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/tool-ocaml/t301-object.ml	2011-07-07 14:32:00.000000000 +0000
@@ -7,7 +7,7 @@
   t301-object.ml -o t301-object.byte
 
 ***)
-(* $Id: t301-object.ml 6363 2004-06-02 09:42:01Z basile $ *)
+(* $Id: t301-object.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 
 class c = object (self)
@@ -26,4 +26,4 @@
   if y <> 2 then raise Not_found;
   if z <> 4 then raise Not_found;;
 
-(**** eof $Id: t301-object.ml 6363 2004-06-02 09:42:01Z basile $ *)
+(**** eof $Id: t301-object.ml 11113 2011-07-07 14:32:00Z maranget $ *)
diff -Nru jocaml-3.12.0/testsuite/tests/tool-ocamldoc/odoc_test.ml jocaml-3.12.1/testsuite/tests/tool-ocamldoc/odoc_test.ml
--- jocaml-3.12.0/testsuite/tests/tool-ocamldoc/odoc_test.ml	2010-04-08 14:16:27.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/tool-ocamldoc/odoc_test.ml	2011-07-07 14:32:00.000000000 +0000
@@ -9,7 +9,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: odoc_test.ml 6127 2004-02-20 16:28:27Z guesdon $ *)
+(* $Id: odoc_test.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (** Custom generator to perform test on ocamldoc. *)
 
diff -Nru jocaml-3.12.0/testsuite/tests/tool-ocamldoc/.svnignore jocaml-3.12.1/testsuite/tests/tool-ocamldoc/.svnignore
--- jocaml-3.12.0/testsuite/tests/tool-ocamldoc/.svnignore	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/tool-ocamldoc/.svnignore	2011-07-07 14:32:00.000000000 +0000
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+svn propset svn:ignore -F - . <<EOF
+
+*.result
+*.byte
+*.native
+program
+ocamldoc.sty
+ocamldoc.out
+style.css
+*.html
+
+EOF
diff -Nru jocaml-3.12.0/testsuite/tests/typing-fstclassmod/.svnignore jocaml-3.12.1/testsuite/tests/typing-fstclassmod/.svnignore
--- jocaml-3.12.0/testsuite/tests/typing-fstclassmod/.svnignore	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/typing-fstclassmod/.svnignore	2011-07-07 14:32:00.000000000 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+svn propset svn:ignore -F - . <<EOF
+
+*.result
+*.byte
+*.native
+program
+
+EOF
diff -Nru jocaml-3.12.0/testsuite/tests/typing-labels/mixin2.ml jocaml-3.12.1/testsuite/tests/typing-labels/mixin2.ml
--- jocaml-3.12.0/testsuite/tests/typing-labels/mixin2.ml	2010-04-07 10:22:44.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/typing-labels/mixin2.ml	2011-07-07 14:32:00.000000000 +0000
@@ -1,4 +1,4 @@
-(* $Id: mixin2.ml 5929 2003-11-19 02:36:58Z garrigue $ *)
+(* $Id: mixin2.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Full fledge version, using objects to structure code *)
 
diff -Nru jocaml-3.12.0/testsuite/tests/typing-labels/mixin3.ml jocaml-3.12.1/testsuite/tests/typing-labels/mixin3.ml
--- jocaml-3.12.0/testsuite/tests/typing-labels/mixin3.ml	2010-04-07 10:22:44.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/typing-labels/mixin3.ml	2011-07-07 14:32:00.000000000 +0000
@@ -1,4 +1,4 @@
-(* $Id: mixin3.ml 5929 2003-11-19 02:36:58Z garrigue $ *)
+(* $Id: mixin3.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Full fledge version, using objects to structure code *)
 
diff -Nru jocaml-3.12.0/testsuite/tests/typing-labels/mixin.ml jocaml-3.12.1/testsuite/tests/typing-labels/mixin.ml
--- jocaml-3.12.0/testsuite/tests/typing-labels/mixin.ml	2010-04-07 10:22:44.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/typing-labels/mixin.ml	2011-07-07 14:32:00.000000000 +0000
@@ -1,4 +1,4 @@
-(* $Id: mixin.ml 5929 2003-11-19 02:36:58Z garrigue $ *)
+(* $Id: mixin.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 open StdLabels
 open MoreLabels
diff -Nru jocaml-3.12.0/testsuite/tests/typing-labels/.svnignore jocaml-3.12.1/testsuite/tests/typing-labels/.svnignore
--- jocaml-3.12.0/testsuite/tests/typing-labels/.svnignore	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/typing-labels/.svnignore	2011-07-07 14:32:00.000000000 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+svn propset svn:ignore -F - . <<EOF
+
+*.result
+*.byte
+*.native
+program
+
+EOF
diff -Nru jocaml-3.12.0/testsuite/tests/typing-modules/Makefile jocaml-3.12.1/testsuite/tests/typing-modules/Makefile
--- jocaml-3.12.0/testsuite/tests/typing-modules/Makefile	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/typing-modules/Makefile	2010-10-08 11:53:19.000000000 +0000
@@ -0,0 +1,3 @@
+include ../../makefiles/Makefile.toplevel
+include ../../makefiles/Makefile.common
+
diff -Nru jocaml-3.12.0/testsuite/tests/typing-modules/Test.ml jocaml-3.12.1/testsuite/tests/typing-modules/Test.ml
--- jocaml-3.12.0/testsuite/tests/typing-modules/Test.ml	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/typing-modules/Test.ml	2010-10-08 11:53:19.000000000 +0000
@@ -0,0 +1,5 @@
+module type S = sig type t and s = t end;;
+module type S' = S with type t := int;;
+
+module type S = sig module rec M : sig end and N : sig end end;;
+module type S' = S with module M := String;;
diff -Nru jocaml-3.12.0/testsuite/tests/typing-modules/Test.ml.reference jocaml-3.12.1/testsuite/tests/typing-modules/Test.ml.reference
--- jocaml-3.12.0/testsuite/tests/typing-modules/Test.ml.reference	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/typing-modules/Test.ml.reference	2010-08-21 02:27:53.000000000 +0000
@@ -0,0 +1,6 @@
+
+# module type S = sig type t and s = t end
+# module type S' = sig type s = int end
+#   module type S = sig module rec M : sig  end and N : sig  end end
+# module type S' = sig module rec N : sig  end end
+# 
diff -Nru jocaml-3.12.0/testsuite/tests/typing-modules-bugs/Makefile jocaml-3.12.1/testsuite/tests/typing-modules-bugs/Makefile
--- jocaml-3.12.0/testsuite/tests/typing-modules-bugs/Makefile	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/typing-modules-bugs/Makefile	2011-06-11 08:29:36.000000000 +0000
@@ -0,0 +1,2 @@
+include ../../makefiles/Makefile.okbad
+include ../../makefiles/Makefile.common
diff -Nru jocaml-3.12.0/testsuite/tests/typing-modules-bugs/pr5164_ok.ml jocaml-3.12.1/testsuite/tests/typing-modules-bugs/pr5164_ok.ml
--- jocaml-3.12.0/testsuite/tests/typing-modules-bugs/pr5164_ok.ml	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/typing-modules-bugs/pr5164_ok.ml	2010-10-08 11:53:19.000000000 +0000
@@ -0,0 +1,9 @@
+module type INCLUDING = sig
+  include module type of List
+  include module type of ListLabels
+end 
+
+module Including_typed: INCLUDING = struct
+  include List
+  include ListLabels
+end
diff -Nru jocaml-3.12.0/testsuite/tests/typing-objects/.svnignore jocaml-3.12.1/testsuite/tests/typing-objects/.svnignore
--- jocaml-3.12.0/testsuite/tests/typing-objects/.svnignore	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/typing-objects/.svnignore	2011-07-07 14:32:00.000000000 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+svn propset svn:ignore -F - . <<EOF
+
+*.result
+*.byte
+*.native
+program
+
+EOF
diff -Nru jocaml-3.12.0/testsuite/tests/typing-objects-bugs/pr5156_ok.ml jocaml-3.12.1/testsuite/tests/typing-objects-bugs/pr5156_ok.ml
--- jocaml-3.12.0/testsuite/tests/typing-objects-bugs/pr5156_ok.ml	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/typing-objects-bugs/pr5156_ok.ml	2011-07-07 14:32:00.000000000 +0000
@@ -0,0 +1,10 @@
+class type t = object end;;
+class ['a] o1 = object (self : #t as 'a) end;;
+type 'a obj = ( < .. > as 'a);;
+class type ['a] o2 = object ('a obj) end;;
+class ['a] o3 = object (self : 'a obj) end;;
+class ['a] o4 = object (self) method m = (self : 'a obj) end;;
+(*
+let o = object (self : 'a obj) end;;
+let o = object (self) method m = (self : 'a obj) end;;
+*)
diff -Nru jocaml-3.12.0/testsuite/tests/typing-poly/poly.ml jocaml-3.12.1/testsuite/tests/typing-poly/poly.ml
--- jocaml-3.12.0/testsuite/tests/typing-poly/poly.ml	2010-06-29 13:52:11.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/typing-poly/poly.ml	2011-07-07 14:32:00.000000000 +0000
@@ -1,4 +1,4 @@
-(* $Id: poly.ml 9396 2009-10-26 07:11:36Z garrigue $ *)
+(* $Id: poly.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 (*
    Polymorphic methods are now available in the main branch.
    Enjoy.
diff -Nru jocaml-3.12.0/testsuite/tests/typing-poly/.svnignore jocaml-3.12.1/testsuite/tests/typing-poly/.svnignore
--- jocaml-3.12.0/testsuite/tests/typing-poly/.svnignore	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/typing-poly/.svnignore	2011-07-07 14:32:00.000000000 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+svn propset svn:ignore -F - . <<EOF
+
+*.result
+*.byte
+*.native
+program
+
+EOF
diff -Nru jocaml-3.12.0/testsuite/tests/typing-private/.svnignore jocaml-3.12.1/testsuite/tests/typing-private/.svnignore
--- jocaml-3.12.0/testsuite/tests/typing-private/.svnignore	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/typing-private/.svnignore	2011-07-07 14:32:00.000000000 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+svn propset svn:ignore -F - . <<EOF
+
+*.result
+*.byte
+*.native
+program
+
+EOF
diff -Nru jocaml-3.12.0/testsuite/tests/typing-typeparam/.svnignore jocaml-3.12.1/testsuite/tests/typing-typeparam/.svnignore
--- jocaml-3.12.0/testsuite/tests/typing-typeparam/.svnignore	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/testsuite/tests/typing-typeparam/.svnignore	2011-07-07 14:32:00.000000000 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+svn propset svn:ignore -F - . <<EOF
+
+*.result
+*.byte
+*.native
+program
+
+EOF
diff -Nru jocaml-3.12.0/tools/.depend jocaml-3.12.1/tools/.depend
--- jocaml-3.12.0/tools/.depend	2010-06-04 19:18:21.000000000 +0000
+++ jocaml-3.12.1/tools/.depend	2011-07-07 14:32:00.000000000 +0000
@@ -1,54 +1,62 @@
-depend.cmi: ../parsing/parsetree.cmi 
-profiling.cmi: 
+depend.cmi: ../parsing/parsetree.cmi
+profiling.cmi:
 addlabels.cmo: ../parsing/parsetree.cmi ../parsing/parse.cmi \
-    ../parsing/longident.cmi ../parsing/location.cmi ../parsing/asttypes.cmi 
+    ../parsing/longident.cmi ../parsing/location.cmi ../parsing/asttypes.cmi
 addlabels.cmx: ../parsing/parsetree.cmi ../parsing/parse.cmx \
-    ../parsing/longident.cmx ../parsing/location.cmx ../parsing/asttypes.cmi 
-cvt_emit.cmo: 
-cvt_emit.cmx: 
-dumpobj.cmo: ../utils/tbl.cmi opnames.cmo ../parsing/location.cmi \
-    ../bytecomp/lambda.cmi ../bytecomp/instruct.cmi ../typing/ident.cmi \
-    ../bytecomp/emitcode.cmi ../utils/config.cmi ../bytecomp/cmo_format.cmi \
-    ../bytecomp/bytesections.cmi ../parsing/asttypes.cmi 
-dumpobj.cmx: ../utils/tbl.cmx opnames.cmx ../parsing/location.cmx \
-    ../bytecomp/lambda.cmx ../bytecomp/instruct.cmx ../typing/ident.cmx \
-    ../bytecomp/emitcode.cmx ../utils/config.cmi ../bytecomp/cmo_format.cmi \
-    ../bytecomp/bytesections.cmx ../parsing/asttypes.cmi 
-myocamlbuild_config.cmo: 
-myocamlbuild_config.cmx: 
+    ../parsing/longident.cmx ../parsing/location.cmx ../parsing/asttypes.cmi
+cvt_emit.cmo:
+cvt_emit.cmx:
+depend.cmo: ../parsing/parsetree.cmi ../parsing/longident.cmi \
+    ../parsing/location.cmi depend.cmi
+depend.cmx: ../parsing/parsetree.cmi ../parsing/longident.cmx \
+    ../parsing/location.cmx depend.cmi
+dumpobj.cmo: ../utils/tbl.cmi opnames.cmo ../bytecomp/opcodes.cmo \
+    ../parsing/location.cmi ../bytecomp/lambda.cmi ../bytecomp/instruct.cmi \
+    ../typing/ident.cmi ../bytecomp/emitcode.cmi ../utils/config.cmi \
+    ../bytecomp/cmo_format.cmi ../bytecomp/bytesections.cmi \
+    ../parsing/asttypes.cmi
+dumpobj.cmx: ../utils/tbl.cmx opnames.cmx ../bytecomp/opcodes.cmx \
+    ../parsing/location.cmx ../bytecomp/lambda.cmx ../bytecomp/instruct.cmx \
+    ../typing/ident.cmx ../bytecomp/emitcode.cmx ../utils/config.cmx \
+    ../bytecomp/cmo_format.cmi ../bytecomp/bytesections.cmx \
+    ../parsing/asttypes.cmi
+myocamlbuild_config.cmo:
+myocamlbuild_config.cmx:
 objinfo.cmo: ../utils/misc.cmi ../utils/config.cmi ../asmcomp/cmx_format.cmi \
     ../bytecomp/cmo_format.cmi ../asmcomp/clambda.cmi \
-    ../bytecomp/bytesections.cmi 
-objinfo.cmx: ../utils/misc.cmx ../utils/config.cmi ../asmcomp/cmx_format.cmi \
+    ../bytecomp/bytesections.cmi
+objinfo.cmx: ../utils/misc.cmx ../utils/config.cmx ../asmcomp/cmx_format.cmi \
     ../bytecomp/cmo_format.cmi ../asmcomp/clambda.cmx \
-    ../bytecomp/bytesections.cmx 
-ocaml299to3.cmo: 
-ocaml299to3.cmx: 
+    ../bytecomp/bytesections.cmx
+ocaml299to3.cmo:
+ocaml299to3.cmx:
+ocamlcp.cmo: ../driver/main_args.cmi
+ocamlcp.cmx: ../driver/main_args.cmx
 ocamldep.cmo: ../parsing/syntaxerr.cmi ../parsing/parsetree.cmi \
     ../parsing/parse.cmi ../utils/misc.cmi ../parsing/longident.cmi \
     ../parsing/location.cmi ../parsing/lexer.cmi depend.cmi \
-    ../utils/config.cmi ../utils/clflags.cmi 
+    ../utils/config.cmi ../utils/clflags.cmi
 ocamldep.cmx: ../parsing/syntaxerr.cmx ../parsing/parsetree.cmi \
     ../parsing/parse.cmx ../utils/misc.cmx ../parsing/longident.cmx \
-    ../parsing/location.cmx ../parsing/lexer.cmi depend.cmx \
-    ../utils/config.cmi ../utils/clflags.cmx 
-ocamlmklib.cmo: myocamlbuild_config.cmo 
-ocamlmklib.cmx: myocamlbuild_config.cmx 
-ocamlmktop.cmo: ../utils/ccomp.cmi 
-ocamlmktop.cmx: ../utils/ccomp.cmx 
+    ../parsing/location.cmx ../parsing/lexer.cmx depend.cmx \
+    ../utils/config.cmx ../utils/clflags.cmx
+ocamlmklib.cmo: myocamlbuild_config.cmo
+ocamlmklib.cmx: myocamlbuild_config.cmx
+ocamlmktop.cmo: ../utils/ccomp.cmi
+ocamlmktop.cmx: ../utils/ccomp.cmx
 ocamlprof.cmo: ../utils/warnings.cmi ../parsing/syntaxerr.cmi \
     ../parsing/parsetree.cmi ../parsing/parse.cmi ../utils/misc.cmi \
     ../parsing/location.cmi ../parsing/lexer.cmi ../utils/config.cmi \
-    ../utils/clflags.cmi 
+    ../utils/clflags.cmi
 ocamlprof.cmx: ../utils/warnings.cmx ../parsing/syntaxerr.cmx \
     ../parsing/parsetree.cmi ../parsing/parse.cmx ../utils/misc.cmx \
-    ../parsing/location.cmx ../parsing/lexer.cmi ../utils/config.cmi \
-    ../utils/clflags.cmx 
-opnames.cmo: 
-opnames.cmx: 
-primreq.cmo: ../utils/config.cmi ../bytecomp/cmo_format.cmi 
-primreq.cmx: ../utils/config.cmi ../bytecomp/cmo_format.cmi 
-profiling.cmo: profiling.cmi 
-profiling.cmx: profiling.cmi 
-scrapelabels.cmo: 
-scrapelabels.cmx: 
+    ../parsing/location.cmx ../parsing/lexer.cmx ../utils/config.cmx \
+    ../utils/clflags.cmx
+opnames.cmo:
+opnames.cmx:
+primreq.cmo: ../utils/config.cmi ../bytecomp/cmo_format.cmi
+primreq.cmx: ../utils/config.cmx ../bytecomp/cmo_format.cmi
+profiling.cmo: profiling.cmi
+profiling.cmx: profiling.cmi
+scrapelabels.cmo:
+scrapelabels.cmx:
diff -Nru jocaml-3.12.0/tools/Makefile.shared jocaml-3.12.1/tools/Makefile.shared
--- jocaml-3.12.0/tools/Makefile.shared	2010-06-29 13:52:11.000000000 +0000
+++ jocaml-3.12.1/tools/Makefile.shared	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 #                                                                       #
 #########################################################################
 
-# $Id: Makefile.shared 10611 2010-06-29 13:52:11Z maranget $
+# $Id: Makefile.shared 11113 2011-07-07 14:32:00Z maranget $
 
 include ../config/Makefile
 
@@ -76,12 +76,6 @@
 clean::
 	rm -f ocamlprof ocamlcp
 
-install::
-	cp ocamlmktop $(BINDIR)/jocamlmktop$(EXE)
-
-clean::
-	rm -f ocamlmktop
-
 # To help building mixed-mode libraries (Caml + C)
 
 ocamlmklib: myocamlbuild_config.cmo ocamlmklib.cmo
@@ -121,7 +115,7 @@
 # To make custom toplevels (see Makefile/Makefile.nt)
 
 install::
-	cp ocamlmktop $(BINDIR)/jocamlmktop$(EXE)
+	cp ocamlmktop $(BINDIR)/jocamlmktop  # no $(EXE) here, ocamlmktop is a script
 
 clean::
 	rm -f ocamlmktop
diff -Nru jocaml-3.12.0/tools/ocamldep.ml jocaml-3.12.1/tools/ocamldep.ml
--- jocaml-3.12.0/tools/ocamldep.ml	2010-06-04 19:18:21.000000000 +0000
+++ jocaml-3.12.1/tools/ocamldep.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: ocamldep.ml 10514 2010-06-04 19:18:21Z maranget $ *)
+(* $Id: ocamldep.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 open Format
 open Location
@@ -21,6 +21,8 @@
 (* Print the dependencies *)
 
 let load_path = ref ([] : (string * string array) list)
+let ml_synonyms = ref [".ml"]
+let mli_synonyms = ref [".mli"]
 let native_only = ref false
 let force_slash = ref false
 let error_occurred = ref false
@@ -49,6 +51,14 @@
     fprintf Format.err_formatter "@[Bad -I option: %s@]@." msg;
     error_occurred := true
 
+let add_to_synonym_list synonyms suffix =
+  if (String.length suffix) > 1 && suffix.[0] = '.' then
+    synonyms := suffix :: !synonyms
+  else begin
+    fprintf Format.err_formatter "@[Bad suffix: '%s'@]@." suffix;
+    error_occurred := true
+  end
+
 let find_file name =
   let uname = String.uncapitalize name in
   let rec find_in_array a pos =
@@ -65,19 +75,25 @@
       | None -> find_in_path rem in
   find_in_path !load_path
 
+let rec find_file_in_list = function
+  [] -> raise Not_found
+| x :: rem -> try find_file x with Not_found -> find_file_in_list rem
+
 let find_dependency modname (byt_deps, opt_deps) =
   try
-    let filename = find_file (modname ^ ".mli") in
-    let basename = Filename.chop_suffix filename ".mli" in
+    let candidates = List.map ((^) modname) !mli_synonyms in
+    let filename = find_file_in_list candidates in
+    let basename = Filename.chop_extension filename in
     let optname =
-      if Sys.file_exists (basename ^ ".ml")
+      if List.exists (fun ext -> Sys.file_exists (basename ^ ext)) !ml_synonyms
       then basename ^ ".cmx"
       else basename ^ ".cmi" in
     ((basename ^ ".cmi") :: byt_deps, optname :: opt_deps)
   with Not_found ->
   try
-    let filename = find_file (modname ^ ".ml") in
-    let basename = Filename.chop_suffix filename ".ml" in
+    let candidates = List.map ((^) modname) !ml_synonyms in
+    let filename = find_file_in_list candidates in
+    let basename = Filename.chop_extension filename in
     let bytename =
       basename ^ (if !native_only then ".cmx" else ".cmo") in
     (bytename :: byt_deps, (basename ^ ".cmx") :: opt_deps)
@@ -131,7 +147,12 @@
 let print_raw_dependencies source_file deps =
   print_filename source_file; print_string ":";
   Depend.StringSet.iter
-    (fun dep -> print_char ' '; print_string dep)
+    (fun dep ->
+      if (String.length dep > 0)
+          && (match dep.[0] with 'A'..'Z' -> true | _ -> false) then begin
+            print_char ' ';
+            print_string dep
+          end)
     deps;
   print_char '\n'
 
@@ -205,7 +226,7 @@
     end else begin
       let basename = Filename.chop_extension source_file in
       let init_deps =
-        if Sys.file_exists (basename ^ ".mli")
+        if List.exists (fun ext -> Sys.file_exists (basename ^ ext)) !mli_synonyms
         then let cmi_name = basename ^ ".cmi" in ([cmi_name], [cmi_name])
         else ([], []) in
       let (byt_deps, opt_deps) =
@@ -266,9 +287,9 @@
     report_err x
 
 let file_dependencies source_file =
-  if Filename.check_suffix source_file ".ml" then
+  if List.exists (Filename.check_suffix source_file) !ml_synonyms then
     file_dependencies_as ML source_file
-  else if Filename.check_suffix source_file ".mli" then
+  else if List.exists (Filename.check_suffix source_file) !mli_synonyms then
     file_dependencies_as MLI source_file
   else ()
 
@@ -298,6 +319,10 @@
        "<f> Process <f> as a .ml file";
      "-intf", Arg.String (file_dependencies_as MLI),
        "<f> Process <f> as a .mli file";
+     "-ml-synonym", Arg.String(add_to_synonym_list ml_synonyms),
+       "<e> Consider <e> as a synonym of the .ml extension";
+     "-mli-synonym", Arg.String(add_to_synonym_list mli_synonyms),
+       "<e> Consider <e> as a synonym of the .mli extension";
      "-modules", Arg.Set raw_dependencies,
        " Print module dependencies in raw form (not suitable for make)";
      "-native", Arg.Set native_only,
diff -Nru jocaml-3.12.0/tools/ocamlmklib.mlp jocaml-3.12.1/tools/ocamlmklib.mlp
--- jocaml-3.12.0/tools/ocamlmklib.mlp	2010-06-04 19:18:21.000000000 +0000
+++ jocaml-3.12.1/tools/ocamlmklib.mlp	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: ocamlmklib.mlp 10514 2010-06-04 19:18:21Z maranget $ *)
+(* $Id: ocamlmklib.mlp 11113 2011-07-07 14:32:00Z maranget $ *)
 
 open Printf
 open Myocamlbuild_config
@@ -20,12 +20,11 @@
 let compiler_path name =
   if Sys.os_type = "Win32" then name else Filename.concat bindir name
 
-let bytecode_objs = ref []  (* .cmo,.cma,.ml,.mli files to pass to ocamlc *)
-and native_objs = ref []    (* .cmx,.cmxa,.ml,.mli files to pass to ocamlopt *)
+let bytecode_objs = ref []  (* .cmo,.cma,.ml,.mli files to pass to jocamlc *)
+and native_objs = ref []    (* .cmx,.cmxa,.ml,.mli files to pass to jocamlopt *)
 and c_objs = ref []         (* .o, .a, .obj, .lib, .dll files to pass to mksharedlib and ar *)
-and caml_libs = ref []      (* -cclib to pass to ocamlc, ocamlopt *)
-and caml_opts = ref []      (* -ccopt to pass to ocamlc, ocamlopt *)
-
+and caml_libs = ref []      (* -cclib to pass to jocamlc, jocamlopt *)
+and caml_opts = ref []      (* -ccopt to pass to jocamlc, jocamlopt *)
 and dynlink = ref supports_shared_libraries
 and failsafe = ref false    (* whether to fall back on static build only *)
 and c_libs = ref []         (* libs to pass to mksharedlib and jocamlc -cclib *)
@@ -33,7 +32,6 @@
 and ld_opts = ref []        (* options to pass only to the linker *)
 and jocamlc = ref (compiler_path "jocamlc")
 and jocamlopt = ref (compiler_path "jocamlopt")
-
 and output = ref "a"        (* Output name for Caml part of library *)
 and output_c = ref ""       (* Output name for C part of library *)
 and rpath = ref []          (* rpath options *)
@@ -98,9 +96,9 @@
      (c_opts := s :: !c_opts;
       let l = chop_prefix s "-L" in
       if not (Filename.is_relative l) then rpath := l :: !rpath)
-    else if s = "-ocamlc" || s = "-jocamlc" then
+    else if s = "-jocamlc" || s = "-ocamlc" then
       jocamlc := next_arg ()
-    else if s = "-ocamlopt" || s = "-jocamlopt" then
+    else if s = "-jocamlopt" || s = "-ocamlopt" then
       jocamlopt := next_arg ()
     else if s = "-o" then
       output := next_arg()
@@ -143,72 +141,37 @@
   if !output_c = "" then output_c := !output
 
 let usage = "\
-<<<<<<< .courant
-Usage: jocamlmklib [options] <.cmo|.cma|.cmx|.cmxa|.ml|.mli|.o|.a|.obj|.lib|.dll files>
-
-Options are:
-  -cclib <lib>   C library passed to jocamlc -a or jocamlopt -a only
-  -ccopt <opt>   C option passed to jocamlc -a or jocamlopt -a only
-  -custom        disable dynamic loading
-  -dllpath <dir> Add <dir> to the run-time search path for DLLs
-  -F<dir>        Specify a framework directory (MacOSX)
-  -framework <name>    Use framework <name> (MacOSX)
-  -help          Print this help message and exit
-  --help         Same as -help
-  -h             Same as -help
-  -I <dir>       Add <dir> to the path searched for Caml object files
-  -jocamlc <cmd>  Use <cmd> in place of \"jocamlc\"
-  -jocamlopt <cmd> Use <cmd> in place of \"jocamlopt\"
-  -failsafe      fall back to static linking if DLL construction failed
-  -ldopt <opt>   C option passed to the shared linker only
-  -linkall       Build Caml archive with link-all behavior
-  -l<lib>        Specify a dependent C library
-  -L<dir>        Add <dir> to the path searched for C libraries
-  -ocamlc <cmd>  Same as -jocamlc
-  -ocamlopt <cmd>  Same as -jocamlopt
-  -o <name>      Generated Caml library is named <name>.cma or <name>.cmxa
-  -oc <name>     Generated C library is named dll<name>.so or lib<name>.a
-  -rpath <dir>   Same as -dllpath <dir>
-  -R<dir>        Same as -rpath
-  -verbose       Print commands before executing them
-  -v             same as -verbose
-  -version       Print version and exit
-  -Wl,-rpath,<dir>     Same as -dllpath <dir>
-  -Wl,-rpath -Wl,<dir> Same as -dllpath <dir>
-  -Wl,-R<dir>          Same as -dllpath <dir>
-=======
-Usage: ocamlmklib [options] <.cmo|.cma|.cmx|.cmxa|.ml|.mli|.o|.a|.obj|.lib|.dll files>\n\
-Options are:\n\
-  -cclib <lib>   C library passed to ocamlc -a or ocamlopt -a only\n\
-  -ccopt <opt>   C option passed to ocamlc -a or ocamlopt -a only\n\
-  -custom        disable dynamic loading\n\
-  -dllpath <dir> Add <dir> to the run-time search path for DLLs\n\
-  -F<dir>        Specify a framework directory (MacOSX)\n\
-  -framework <name>    Use framework <name> (MacOSX)\n\
-  -help          Print this help message and exit\n\
-  --help         Same as -help\n\
-  -h             Same as -help\n\
-  -I <dir>       Add <dir> to the path searched for Caml object files\n\
-  -failsafe      fall back to static linking if DLL construction failed\n\
-  -ldopt <opt>   C option passed to the shared linker only\n\
-  -linkall       Build Caml archive with link-all behavior\n\
-  -l<lib>        Specify a dependent C library\n\
-  -L<dir>        Add <dir> to the path searched for C libraries\n\
-  -ocamlc <cmd>  Use <cmd> in place of \"ocamlc\"\n\
-  -ocamlopt <cmd> Use <cmd> in place of \"ocamlopt\"\n\
-  -o <name>      Generated Caml library is named <name>.cma or <name>.cmxa\n\
-  -oc <name>     Generated C library is named dll<name>.so or lib<name>.a\n\
-  -rpath <dir>   Same as -dllpath <dir>\n\
-  -R<dir>        Same as -rpath\n\
-  -verbose       Print commands before executing them\n\
-  -v             same as -verbose\n\
-  -version       Print version and exit\n\
-  -vnum          Print version number and exit\n\
-  -Wl,-rpath,<dir>     Same as -dllpath <dir>\n\
-  -Wl,-rpath -Wl,<dir> Same as -dllpath <dir>\n\
-  -Wl,-R<dir>          Same as -dllpath <dir>\n\
->>>>>>> .fusion-droit.r10497
-"
+Usage: jocamlmklib [options] <.cmo|.cma|.cmx|.cmxa|.ml|.mli|.o|.a|.obj|.lib|.dll files>\
+\nOptions are:\
+\n  -cclib <lib>   C library passed to jocamlc -a or jocamlopt -a only\
+\n  -ccopt <opt>   C option passed to jocamlc -a or jocamlopt -a only\
+\n  -custom        disable dynamic loading\
+\n  -dllpath <dir> Add <dir> to the run-time search path for DLLs\
+\n  -F<dir>        Specify a framework directory (MacOSX)\
+\n  -framework <name>    Use framework <name> (MacOSX)\
+\n  -help          Print this help message and exit\
+\n  --help         Same as -help\
+\n  -h             Same as -help\
+\n  -I <dir>       Add <dir> to the path searched for Caml object files\
+\n  -failsafe      fall back to static linking if DLL construction failed\
+\n  -ldopt <opt>   C option passed to the shared linker only\
+\n  -linkall       Build Caml archive with link-all behavior\
+\n  -l<lib>        Specify a dependent C library\
+\n  -L<dir>        Add <dir> to the path searched for C libraries\
+\n  -[j]ocamlc <cmd>  Use <cmd> in place of \"jocamlc\"\
+\n  -[j]ocamlopt <cmd> Use <cmd> in place of \"jocamlopt\"\
+\n  -o <name>      Generated Caml library is named <name>.cma or <name>.cmxa\
+\n  -oc <name>     Generated C library is named dll<name>.so or lib<name>.a\
+\n  -rpath <dir>   Same as -dllpath <dir>\
+\n  -R<dir>        Same as -rpath\
+\n  -verbose       Print commands before executing them\
+\n  -v             same as -verbose\
+\n  -version       Print version and exit\
+\n  -vnum          Print version number and exit\
+\n  -Wl,-rpath,<dir>     Same as -dllpath <dir>\
+\n  -Wl,-rpath -Wl,<dir> Same as -dllpath <dir>\
+\n  -Wl,-R<dir>          Same as -dllpath <dir>\
+\n"
 
 let command cmd =
   if !verbose then (print_string "+ "; print_string cmd; print_newline());
diff -Nru jocaml-3.12.0/tools/remove_DEBUG jocaml-3.12.1/tools/remove_DEBUG
--- jocaml-3.12.0/tools/remove_DEBUG	1970-01-01 00:00:00.000000000 +0000
+++ jocaml-3.12.1/tools/remove_DEBUG	2011-07-08 09:23:38.000000000 +0000
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+#(***********************************************************************)
+#(*                            OCamldoc                                 *)
+#(*                                                                     *)
+#(*            Damien Doligez, projet Moscova, INRIA Rocquencourt       *)
+#(*                                                                     *)
+#(*  Copyright 2003 Institut National de Recherche en Informatique et   *)
+#(*  en Automatique.  All rights reserved.  This file is distributed    *)
+#(*  under the terms of the Q Public License version 1.0.               *)
+#(*                                                                     *)
+#(***********************************************************************)
+
+# $Id: remove_DEBUG 11118 2011-07-08 09:23:38Z maranget $
+
+# usage: remove_DEBUG <file>
+# remove from <file> every line that contains the string "DEBUG",
+# respecting the cpp # line annotation conventions
+
+echo "# 1 \"$1\""
+LC_ALL=C sed -e '/DEBUG/c\
+(* DEBUG statement removed *)' "$1"
diff -Nru jocaml-3.12.0/typing/ctype.ml jocaml-3.12.1/typing/ctype.ml
--- jocaml-3.12.0/typing/ctype.ml	2010-06-29 13:52:11.000000000 +0000
+++ jocaml-3.12.1/typing/ctype.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: ctype.ml 10611 2010-06-29 13:52:11Z maranget $ *)
+(* $Id: ctype.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Operations on core types *)
 
@@ -177,6 +177,11 @@
                   (*  Miscellaneous operations on object types  *)
                   (**********************************************)
 
+(* Note:
+   We need to maintain some invariants:
+   * cty_self must be a Tobject
+   * ...
+*)
 
 (**** Object field manipulation. ****)
 
@@ -879,6 +884,20 @@
   cleanup_types ();
   (ty_args, ty_lst, ty)
 
+let instance_declaration decl =
+  let decl =
+    {decl with type_params = List.map copy decl.type_params;
+     type_manifest = may_map copy decl.type_manifest;
+     type_kind = match decl.type_kind with
+     | Type_abstract -> Type_abstract
+     | Type_variant cl ->
+         Type_variant (List.map (fun (s,tl) -> (s, List.map copy tl)) cl)
+     | Type_record (fl, rr) ->
+         Type_record (List.map (fun (s,m,ty) -> (s, m, copy ty)) fl, rr)}
+  in
+  cleanup_types ();
+  decl
+
 let instance_class params cty =
   let rec copy_class_type =
     function
diff -Nru jocaml-3.12.0/typing/ctype.mli jocaml-3.12.1/typing/ctype.mli
--- jocaml-3.12.0/typing/ctype.mli	2010-06-29 13:52:11.000000000 +0000
+++ jocaml-3.12.1/typing/ctype.mli	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: ctype.mli 10611 2010-06-29 13:52:11Z maranget $ *)
+(* $Id: ctype.mli 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Operations on core types *)
 
@@ -117,6 +117,7 @@
 val instance_parameterized_type_2:
         type_expr list -> type_expr list -> type_expr ->
         type_expr list * type_expr list * type_expr
+val instance_declaration: type_declaration -> type_declaration
 val instance_class:
         type_expr list -> class_type -> type_expr list * class_type
 val instance_poly:
diff -Nru jocaml-3.12.0/typing/env.ml jocaml-3.12.1/typing/env.ml
--- jocaml-3.12.0/typing/env.ml	2010-06-04 19:17:06.000000000 +0000
+++ jocaml-3.12.1/typing/env.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: env.ml 10508 2010-06-04 19:17:06Z maranget $ *)
+(* $Id: env.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Environment handling *)
 
@@ -896,4 +896,4 @@
   | Need_recursive_types(import, export) ->
       fprintf ppf
         "@[<hov>Unit %s imports from %s, which uses recursive types.@ %s@]"
-        import export "The compilation flag -rectypes is required"
+        export import "The compilation flag -rectypes is required"
diff -Nru jocaml-3.12.0/typing/oprint.ml jocaml-3.12.1/typing/oprint.ml
--- jocaml-3.12.0/typing/oprint.ml	2010-06-04 19:17:06.000000000 +0000
+++ jocaml-3.12.1/typing/oprint.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: oprint.ml 10508 2010-06-04 19:17:06Z maranget $ *)
+(* $Id: oprint.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 open Format
 open Outcometree
@@ -32,7 +32,7 @@
   (List.mem name ["or"; "mod"; "land"; "lor"; "lxor"; "lsl"; "lsr"; "asr"])
   ||
   (match name.[0] with
-      'a'..'z' | '\223'..'\246' | '\248'..'\255' | '_' ->
+      'a'..'z' | 'A'..'Z' | '\223'..'\246' | '\248'..'\255' | '_' ->
         false
     | _ -> true)
 
diff -Nru jocaml-3.12.0/typing/printtyp.ml jocaml-3.12.1/typing/printtyp.ml
--- jocaml-3.12.0/typing/printtyp.ml	2010-06-04 19:17:06.000000000 +0000
+++ jocaml-3.12.1/typing/printtyp.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: printtyp.ml 10508 2010-06-04 19:17:06Z maranget $ *)
+(* $Id: printtyp.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Printing functions *)
 
@@ -746,7 +746,7 @@
   reset ();
   List.iter add_alias params;
   prepare_class_type params cl.cty_type;
-  let sty = self_type cl.cty_type in
+  let sty = Ctype.self_type cl.cty_type in
   List.iter mark_loops params;
 
   List.iter check_name_of_type (List.map proxy params);
@@ -768,7 +768,7 @@
   reset ();
   List.iter add_alias params;
   prepare_class_type params cl.clty_type;
-  let sty = self_type cl.clty_type in
+  let sty = Ctype.self_type cl.clty_type in
   List.iter mark_loops params;
 
   List.iter check_name_of_type (List.map proxy params);
diff -Nru jocaml-3.12.0/typing/typeclass.ml jocaml-3.12.1/typing/typeclass.ml
--- jocaml-3.12.0/typing/typeclass.ml	2010-06-04 19:17:06.000000000 +0000
+++ jocaml-3.12.1/typing/typeclass.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: typeclass.ml 10508 2010-06-04 19:17:06Z maranget $ *)
+(* $Id: typeclass.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 open Misc
 open Parsetree
@@ -360,7 +360,7 @@
 
 and class_signature env sty sign =
   let meths = ref Meths.empty in
-  let self_type = transl_simple_type env false sty in
+  let self_type = Ctype.expand_head env (transl_simple_type env false sty) in
 
   (* Check that the binder is a correct type, and introduce a dummy
      method preventing self type from being closed. *)
@@ -719,7 +719,9 @@
   let added = List.filter (fun x -> List.mem x l1) l2 in
   if added <> [] then
     Location.prerr_warning loc (Warnings.Implicit_public_methods added);
-  {cl_field = fields; cl_meths = meths}, sign
+  {cl_field = fields; cl_meths = meths},
+  if final then sign else
+  {sign with cty_self = Ctype.expand_head val_env public_self}
 
 and class_expr cl_num val_env met_env scl =
   match scl.pcl_desc with
diff -Nru jocaml-3.12.0/typing/typedecl.ml jocaml-3.12.1/typing/typedecl.ml
--- jocaml-3.12.0/typing/typedecl.ml	2010-06-04 19:17:06.000000000 +0000
+++ jocaml-3.12.1/typing/typedecl.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: typedecl.ml 10508 2010-06-04 19:17:06Z maranget $ *)
+(* $Id: typedecl.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (**** Typing of type definitions ****)
 
@@ -783,7 +783,7 @@
 
 (* Translate a "with" constraint -- much simplified version of
     transl_type_decl. *)
-let transl_with_constraint env id row_path sdecl =
+let transl_with_constraint env id row_path orig_decl sdecl =
   reset_type_variables();
   Ctype.begin_def();
   let params =
@@ -791,6 +791,10 @@
       List.map (enter_type_variable true sdecl.ptype_loc) sdecl.ptype_params
     with Already_bound ->
       raise(Error(sdecl.ptype_loc, Repeated_parameter)) in
+  let orig_decl = Ctype.instance_declaration orig_decl in
+  let arity_ok = List.length params = orig_decl.type_arity in
+  if arity_ok then
+    List.iter2 (Ctype.unify_var env) params orig_decl.type_params;
   List.iter
     (function (ty, ty', loc) ->
        try
@@ -803,7 +807,7 @@
   let decl =
     { type_params = params;
       type_arity = List.length params;
-      type_kind = Type_abstract;
+      type_kind = if arity_ok then orig_decl.type_kind else Type_abstract;
       type_private = sdecl.ptype_private;
       type_manifest =
         begin match sdecl.ptype_manifest with
diff -Nru jocaml-3.12.0/typing/typedecl.mli jocaml-3.12.1/typing/typedecl.mli
--- jocaml-3.12.0/typing/typedecl.mli	2010-06-04 19:17:06.000000000 +0000
+++ jocaml-3.12.1/typing/typedecl.mli	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: typedecl.mli 10508 2010-06-04 19:17:06Z maranget $ *)
+(* $Id: typedecl.mli 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Typing of type definitions and primitive definitions *)
 
@@ -35,7 +35,7 @@
     Env.t -> Parsetree.value_description -> value_description
 
 val transl_with_constraint:
-    Env.t -> Ident.t -> Path.t option ->
+    Env.t -> Ident.t -> Path.t option -> type_declaration ->
     Parsetree.type_declaration -> type_declaration
 
 val abstract_type_decl: int -> type_declaration
diff -Nru jocaml-3.12.0/typing/typemod.ml jocaml-3.12.1/typing/typemod.ml
--- jocaml-3.12.0/typing/typemod.ml	2010-06-29 13:52:11.000000000 +0000
+++ jocaml-3.12.1/typing/typemod.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: typemod.ml 10611 2010-06-29 13:52:11Z maranget $ *)
+(* $Id: typemod.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 (* Type-checking of the module language *)
 
@@ -91,6 +91,16 @@
 
 let wrap_param s = {ptyp_desc=Ptyp_var s; ptyp_loc=Location.none}
 
+let make_next_first rs rem =
+  if rs = Trec_first then
+    match rem with
+      Tsig_type (id, decl, Trec_next) :: rem ->
+        Tsig_type (id, decl, Trec_first) :: rem
+    | Tsig_module (id, mty, Trec_next) :: rem ->
+        Tsig_module (id, mty, Trec_first) :: rem
+    | _ -> rem
+  else rem
+
 let merge_constraint initial_env loc sg lid constr =
   let real_id = ref None in
   let rec merge env sg namelist row_id =
@@ -113,7 +123,7 @@
         and id_row = Ident.create (s^"#row") in
         let initial_env = Env.add_type id_row decl_row initial_env in
         let newdecl = Typedecl.transl_with_constraint
-                        initial_env id (Some(Pident id_row)) sdecl in
+                        initial_env id (Some(Pident id_row)) decl sdecl in
         check_type_decl env id row_id newdecl decl rs rem;
         let decl_row = {decl_row with type_params = newdecl.type_params} in
         let rs' = if rs = Trec_first then Trec_not else rs in
@@ -121,7 +131,7 @@
     | (Tsig_type(id, decl, rs) :: rem, [s], Pwith_type sdecl)
       when Ident.name id = s ->
         let newdecl =
-          Typedecl.transl_with_constraint initial_env id None sdecl in
+          Typedecl.transl_with_constraint initial_env id None decl sdecl in
         check_type_decl env id row_id newdecl decl rs rem;
         Tsig_type(id, newdecl, rs) :: rem
     | (Tsig_type(id, decl, rs) :: rem, [s], (Pwith_type _ | Pwith_typesubst _))
@@ -131,10 +141,10 @@
       when Ident.name id = s ->
         (* Check as for a normal with constraint, but discard definition *)
         let newdecl =
-          Typedecl.transl_with_constraint initial_env id None sdecl in
+          Typedecl.transl_with_constraint initial_env id None decl sdecl in
         check_type_decl env id row_id newdecl decl rs rem;
         real_id := Some id;
-        rem
+        make_next_first rs rem
     | (Tsig_module(id, mty, rs) :: rem, [s], Pwith_module lid)
       when Ident.name id = s ->
         let (path, mty') = Typetexp.find_module initial_env loc lid in
@@ -147,7 +157,7 @@
         let newmty = Mtype.strengthen env mty' path in
         ignore(Includemod.modtypes env newmty mty);
         real_id := Some id;
-        rem
+        make_next_first rs rem
     | (Tsig_module(id, mty, rs) :: rem, s :: namelist, _)
       when Ident.name id = s ->
         let newsg = merge env (extract_sig env loc mty) namelist None in
@@ -316,7 +326,8 @@
 
 let rec remove_values ids = function
     [] -> []
-  | Tsig_value (id, _) :: rem when List.exists (Ident.equal id) ids -> rem
+  | Tsig_value (id, _) :: rem
+    when List.exists (Ident.equal id) ids -> remove_values ids rem
   | f :: rem -> f :: remove_values ids rem
 
 let rec get_values = function
diff -Nru jocaml-3.12.0/typing/unused_var.ml jocaml-3.12.1/typing/unused_var.ml
--- jocaml-3.12.0/typing/unused_var.ml	2010-06-04 19:17:06.000000000 +0000
+++ jocaml-3.12.1/typing/unused_var.ml	2011-07-07 14:32:00.000000000 +0000
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: unused_var.ml 10508 2010-06-04 19:17:06Z maranget $ *)
+(* $Id: unused_var.ml 11113 2011-07-07 14:32:00Z maranget $ *)
 
 open Parsetree
 
@@ -132,7 +132,7 @@
   | Pstr_open _ -> ()
   | Pstr_class cdl -> List.iter (class_declaration ppf tbl) cdl;
   | Pstr_class_type _ -> ()
-  | Pstr_include _ -> ()
+  | Pstr_include me -> module_expr ppf tbl me;
 (*>JOCAML*)
   | Pstr_exn_global _ -> ()
   | Pstr_def d -> join_defs ppf tbl d None
diff -Nru jocaml-3.12.0/VERSION jocaml-3.12.1/VERSION
--- jocaml-3.12.0/VERSION	2010-09-06 13:32:53.000000000 +0000
+++ jocaml-3.12.1/VERSION	2011-07-07 14:32:00.000000000 +0000
@@ -1,6 +1,6 @@
-3.12.0
+3.12.1
 
 # The version string is the first line of this file.
 # It must be in the format described in stdlib/sys.mli
 
-# $Id: VERSION 10670 2010-09-06 13:32:53Z maranget $
+# $Id: VERSION 11113 2011-07-07 14:32:00Z maranget $