deps

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3642 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

5 files changed, 89 insertions, 106 deletions

diff --git a/.depend b/.depend
index a1704407d..60b92a317 100644
--- a/.depend
+++ b/.depend
@@ -73,8 +73,8 @@ typing/parmatch.cmi: typing/env.cmi parsing/location.cmi typing/typedtree.cmi \
     typing/types.cmi 
 typing/path.cmi: typing/ident.cmi 
 typing/predef.cmi: typing/ident.cmi typing/path.cmi typing/types.cmi 
-typing/printtyp.cmi: typing/ident.cmi parsing/longident.cmi typing/path.cmi \
-    typing/types.cmi typing/outcometree.cmi
+typing/printtyp.cmi: typing/ident.cmi parsing/longident.cmi \
+    typing/outcometree.cmi typing/path.cmi typing/types.cmi 
 typing/subst.cmi: typing/ident.cmi typing/path.cmi typing/types.cmi 
 typing/typeclass.cmi: parsing/asttypes.cmi typing/ctype.cmi typing/env.cmi \
     typing/ident.cmi parsing/location.cmi parsing/longident.cmi \
@@ -158,13 +158,13 @@ typing/predef.cmx: typing/btype.cmx typing/ident.cmx typing/path.cmx \
 typing/primitive.cmo: utils/misc.cmi typing/primitive.cmi 
 typing/primitive.cmx: utils/misc.cmx typing/primitive.cmi 
 typing/printtyp.cmo: parsing/asttypes.cmi typing/btype.cmi utils/clflags.cmo \
-    typing/ctype.cmi typing/env.cmi typing/ident.cmi typing/outcometree.cmi \
-    parsing/longident.cmi utils/misc.cmi typing/path.cmi typing/predef.cmi \
+    typing/ctype.cmi typing/env.cmi typing/ident.cmi parsing/longident.cmi \
+    utils/misc.cmi typing/outcometree.cmi typing/path.cmi typing/predef.cmi \
     typing/primitive.cmi typing/types.cmi typing/printtyp.cmi 
 typing/printtyp.cmx: parsing/asttypes.cmi typing/btype.cmx utils/clflags.cmx \
     typing/ctype.cmx typing/env.cmx typing/ident.cmx parsing/longident.cmx \
-    utils/misc.cmx typing/path.cmx typing/predef.cmx typing/primitive.cmx \
-    typing/types.cmx typing/printtyp.cmi 
+    utils/misc.cmx typing/outcometree.cmi typing/path.cmx typing/predef.cmx \
+    typing/primitive.cmx typing/types.cmx typing/printtyp.cmi 
 typing/subst.cmo: typing/btype.cmi typing/ident.cmi utils/misc.cmi \
     typing/path.cmi utils/tbl.cmi typing/types.cmi typing/subst.cmi 
 typing/subst.cmx: typing/btype.cmx typing/ident.cmx utils/misc.cmx \
@@ -267,11 +267,11 @@ bytecomp/translmod.cmi: typing/ident.cmi bytecomp/lambda.cmi \
 bytecomp/translobj.cmi: typing/ident.cmi bytecomp/lambda.cmi 
 bytecomp/typeopt.cmi: bytecomp/lambda.cmi typing/path.cmi \
     typing/typedtree.cmi 
-bytecomp/bytegen.cmo: parsing/asttypes.cmi typing/ident.cmi \
+bytecomp/bytegen.cmo: parsing/asttypes.cmi utils/config.cmi typing/ident.cmi \
     bytecomp/instruct.cmi bytecomp/lambda.cmi utils/misc.cmi \
     typing/primitive.cmi bytecomp/switch.cmi typing/types.cmi \
     bytecomp/bytegen.cmi 
-bytecomp/bytegen.cmx: parsing/asttypes.cmi typing/ident.cmx \
+bytecomp/bytegen.cmx: parsing/asttypes.cmi utils/config.cmx typing/ident.cmx \
     bytecomp/instruct.cmx bytecomp/lambda.cmx utils/misc.cmx \
     typing/primitive.cmx bytecomp/switch.cmx typing/types.cmx \
     bytecomp/bytegen.cmi 
@@ -337,8 +337,8 @@ bytecomp/simplif.cmo: parsing/asttypes.cmi utils/clflags.cmo typing/ident.cmi \
     bytecomp/lambda.cmi bytecomp/simplif.cmi 
 bytecomp/simplif.cmx: parsing/asttypes.cmi utils/clflags.cmx typing/ident.cmx \
     bytecomp/lambda.cmx bytecomp/simplif.cmi 
-bytecomp/switch.cmo: utils/misc.cmi bytecomp/switch.cmi 
-bytecomp/switch.cmx: utils/misc.cmx bytecomp/switch.cmi 
+bytecomp/switch.cmo: bytecomp/switch.cmi 
+bytecomp/switch.cmx: bytecomp/switch.cmi 
 bytecomp/symtable.cmo: parsing/asttypes.cmi bytecomp/bytesections.cmi \
     utils/clflags.cmo bytecomp/emitcode.cmi typing/ident.cmi \
     bytecomp/lambda.cmi bytecomp/meta.cmi utils/misc.cmi typing/predef.cmi \
@@ -419,6 +419,8 @@ asmcomp/selectgen.cmi: asmcomp/arch.cmo asmcomp/cmm.cmi typing/ident.cmi \
 asmcomp/selection.cmi: asmcomp/cmm.cmi asmcomp/mach.cmi 
 asmcomp/spill.cmi: asmcomp/mach.cmi 
 asmcomp/split.cmi: asmcomp/mach.cmi 
+asmcomp/arch.cmo: utils/config.cmi 
+asmcomp/arch.cmx: utils/config.cmx 
 asmcomp/asmgen.cmo: utils/clflags.cmo asmcomp/closure.cmi asmcomp/cmm.cmi \
     asmcomp/cmmgen.cmi asmcomp/coloring.cmi asmcomp/comballoc.cmi \
     utils/config.cmi asmcomp/emit.cmi asmcomp/emitaux.cmi asmcomp/interf.cmi \
@@ -491,13 +493,13 @@ asmcomp/compilenv.cmo: asmcomp/clambda.cmi utils/config.cmi typing/env.cmi \
     typing/ident.cmi utils/misc.cmi asmcomp/compilenv.cmi 
 asmcomp/compilenv.cmx: asmcomp/clambda.cmx utils/config.cmx typing/env.cmx \
     typing/ident.cmx utils/misc.cmx asmcomp/compilenv.cmi 
-asmcomp/emit.cmo: asmcomp/arch.cmo utils/clflags.cmo asmcomp/cmm.cmi \
-    asmcomp/compilenv.cmi utils/config.cmi asmcomp/emitaux.cmi \
-    asmcomp/linearize.cmi asmcomp/mach.cmi utils/misc.cmi asmcomp/proc.cmi \
+asmcomp/emit.cmo: asmcomp/arch.cmo asmcomp/cmm.cmi asmcomp/compilenv.cmi \
+    utils/config.cmi asmcomp/emitaux.cmi asmcomp/linearize.cmi \
+    parsing/location.cmi asmcomp/mach.cmi utils/misc.cmi asmcomp/proc.cmi \
     asmcomp/reg.cmi asmcomp/emit.cmi 
-asmcomp/emit.cmx: asmcomp/arch.cmx utils/clflags.cmx asmcomp/cmm.cmx \
-    asmcomp/compilenv.cmx utils/config.cmx asmcomp/emitaux.cmx \
-    asmcomp/linearize.cmx asmcomp/mach.cmx utils/misc.cmx asmcomp/proc.cmx \
+asmcomp/emit.cmx: asmcomp/arch.cmx asmcomp/cmm.cmx asmcomp/compilenv.cmx \
+    utils/config.cmx asmcomp/emitaux.cmx asmcomp/linearize.cmx \
+    parsing/location.cmx asmcomp/mach.cmx utils/misc.cmx asmcomp/proc.cmx \
     asmcomp/reg.cmx asmcomp/emit.cmi 
 asmcomp/emitaux.cmo: asmcomp/emitaux.cmi 
 asmcomp/emitaux.cmx: asmcomp/emitaux.cmi 
@@ -529,16 +531,16 @@ asmcomp/printmach.cmo: asmcomp/arch.cmo asmcomp/cmm.cmi asmcomp/mach.cmi \
 asmcomp/printmach.cmx: asmcomp/arch.cmx asmcomp/cmm.cmx asmcomp/mach.cmx \
     asmcomp/printcmm.cmx asmcomp/proc.cmx asmcomp/reg.cmx \
     asmcomp/printmach.cmi 
-asmcomp/proc.cmo: asmcomp/arch.cmo utils/ccomp.cmi asmcomp/cmm.cmi \
-    asmcomp/mach.cmi utils/misc.cmi asmcomp/reg.cmi asmcomp/proc.cmi 
-asmcomp/proc.cmx: asmcomp/arch.cmx utils/ccomp.cmx asmcomp/cmm.cmx \
-    asmcomp/mach.cmx utils/misc.cmx asmcomp/reg.cmx asmcomp/proc.cmi 
+asmcomp/proc.cmo: asmcomp/arch.cmo utils/ccomp.cmi utils/clflags.cmo \
+    asmcomp/cmm.cmi asmcomp/mach.cmi utils/misc.cmi asmcomp/reg.cmi \
+    asmcomp/proc.cmi 
+asmcomp/proc.cmx: asmcomp/arch.cmx utils/ccomp.cmx utils/clflags.cmx \
+    asmcomp/cmm.cmx asmcomp/mach.cmx utils/misc.cmx asmcomp/reg.cmx \
+    asmcomp/proc.cmi 
 asmcomp/reg.cmo: asmcomp/cmm.cmi asmcomp/reg.cmi 
 asmcomp/reg.cmx: asmcomp/cmm.cmx asmcomp/reg.cmi 
-asmcomp/reload.cmo: asmcomp/arch.cmo asmcomp/cmm.cmi asmcomp/mach.cmi \
-    asmcomp/reg.cmi asmcomp/reloadgen.cmi asmcomp/reload.cmi 
-asmcomp/reload.cmx: asmcomp/arch.cmx asmcomp/cmm.cmx asmcomp/mach.cmx \
-    asmcomp/reg.cmx asmcomp/reloadgen.cmx asmcomp/reload.cmi 
+asmcomp/reload.cmo: asmcomp/reloadgen.cmi asmcomp/reload.cmi 
+asmcomp/reload.cmx: asmcomp/reloadgen.cmx asmcomp/reload.cmi 
 asmcomp/reloadgen.cmo: asmcomp/mach.cmi utils/misc.cmi asmcomp/reg.cmi \
     asmcomp/reloadgen.cmi 
 asmcomp/reloadgen.cmx: asmcomp/mach.cmx utils/misc.cmx asmcomp/reg.cmx \
@@ -547,8 +549,10 @@ asmcomp/schedgen.cmo: asmcomp/arch.cmo asmcomp/cmm.cmi asmcomp/linearize.cmi \
     asmcomp/mach.cmi utils/misc.cmi asmcomp/reg.cmi asmcomp/schedgen.cmi 
 asmcomp/schedgen.cmx: asmcomp/arch.cmx asmcomp/cmm.cmx asmcomp/linearize.cmx \
     asmcomp/mach.cmx utils/misc.cmx asmcomp/reg.cmx asmcomp/schedgen.cmi 
-asmcomp/scheduling.cmo: asmcomp/schedgen.cmi asmcomp/scheduling.cmi 
-asmcomp/scheduling.cmx: asmcomp/schedgen.cmx asmcomp/scheduling.cmi 
+asmcomp/scheduling.cmo: asmcomp/arch.cmo asmcomp/mach.cmi \
+    asmcomp/schedgen.cmi asmcomp/scheduling.cmi 
+asmcomp/scheduling.cmx: asmcomp/arch.cmx asmcomp/mach.cmx \
+    asmcomp/schedgen.cmx asmcomp/scheduling.cmi 
 asmcomp/selectgen.cmo: asmcomp/arch.cmo asmcomp/cmm.cmi typing/ident.cmi \
     asmcomp/mach.cmi utils/misc.cmi asmcomp/proc.cmi asmcomp/reg.cmi \
     utils/tbl.cmi asmcomp/selectgen.cmi 
@@ -556,10 +560,10 @@ asmcomp/selectgen.cmx: asmcomp/arch.cmx asmcomp/cmm.cmx typing/ident.cmx \
     asmcomp/mach.cmx utils/misc.cmx asmcomp/proc.cmx asmcomp/reg.cmx \
     utils/tbl.cmx asmcomp/selectgen.cmi 
 asmcomp/selection.cmo: asmcomp/arch.cmo asmcomp/cmm.cmi asmcomp/mach.cmi \
-    utils/misc.cmi asmcomp/proc.cmi asmcomp/reg.cmi asmcomp/selectgen.cmi \
+    utils/misc.cmi asmcomp/reg.cmi asmcomp/selectgen.cmi \
     asmcomp/selection.cmi 
 asmcomp/selection.cmx: asmcomp/arch.cmx asmcomp/cmm.cmx asmcomp/mach.cmx \
-    utils/misc.cmx asmcomp/proc.cmx asmcomp/reg.cmx asmcomp/selectgen.cmx \
+    utils/misc.cmx asmcomp/reg.cmx asmcomp/selectgen.cmx \
     asmcomp/selection.cmi 
 asmcomp/spill.cmo: asmcomp/mach.cmi utils/misc.cmi asmcomp/proc.cmi \
     asmcomp/reg.cmi asmcomp/spill.cmi 
@@ -610,25 +614,27 @@ driver/optcompile.cmo: asmcomp/asmgen.cmi utils/ccomp.cmi utils/clflags.cmo \
     parsing/location.cmi utils/misc.cmi parsing/parse.cmi \
     parsing/printast.cmi bytecomp/printlambda.cmi typing/printtyp.cmi \
     bytecomp/simplif.cmi bytecomp/translmod.cmi typing/typedtree.cmi \
-    typing/typemod.cmi driver/optcompile.cmi 
+    typing/typemod.cmi utils/warnings.cmi driver/optcompile.cmi 
 driver/optcompile.cmx: asmcomp/asmgen.cmx utils/ccomp.cmx utils/clflags.cmx \
     asmcomp/compilenv.cmx utils/config.cmx typing/env.cmx \
     parsing/location.cmx utils/misc.cmx parsing/parse.cmx \
     parsing/printast.cmx bytecomp/printlambda.cmx typing/printtyp.cmx \
     bytecomp/simplif.cmx bytecomp/translmod.cmx typing/typedtree.cmx \
-    typing/typemod.cmx driver/optcompile.cmi 
+    typing/typemod.cmx utils/warnings.cmx driver/optcompile.cmi 
 driver/opterrors.cmo: asmcomp/asmgen.cmi asmcomp/asmlibrarian.cmi \
-    asmcomp/asmlink.cmi asmcomp/compilenv.cmi typing/env.cmi \
+    asmcomp/asmlink.cmi asmcomp/compilenv.cmi typing/ctype.cmi typing/env.cmi \
     typing/includemod.cmi parsing/lexer.cmi parsing/location.cmi \
-    parsing/syntaxerr.cmi bytecomp/translcore.cmi typing/typeclass.cmi \
-    typing/typecore.cmi typing/typedecl.cmi typing/typemod.cmi \
-    typing/typetexp.cmi driver/opterrors.cmi 
+    parsing/syntaxerr.cmi bytecomp/translclass.cmi bytecomp/translcore.cmi \
+    typing/typeclass.cmi typing/typecore.cmi typing/typedecl.cmi \
+    typing/typemod.cmi typing/typetexp.cmi utils/warnings.cmi \
+    driver/opterrors.cmi 
 driver/opterrors.cmx: asmcomp/asmgen.cmx asmcomp/asmlibrarian.cmx \
-    asmcomp/asmlink.cmx asmcomp/compilenv.cmx typing/env.cmx \
+    asmcomp/asmlink.cmx asmcomp/compilenv.cmx typing/ctype.cmx typing/env.cmx \
     typing/includemod.cmx parsing/lexer.cmx parsing/location.cmx \
-    parsing/syntaxerr.cmx bytecomp/translcore.cmx typing/typeclass.cmx \
-    typing/typecore.cmx typing/typedecl.cmx typing/typemod.cmx \
-    typing/typetexp.cmx driver/opterrors.cmi 
+    parsing/syntaxerr.cmx bytecomp/translclass.cmx bytecomp/translcore.cmx \
+    typing/typeclass.cmx typing/typecore.cmx typing/typedecl.cmx \
+    typing/typemod.cmx typing/typetexp.cmx utils/warnings.cmx \
+    driver/opterrors.cmi 
 driver/optmain.cmo: asmcomp/asmlibrarian.cmi asmcomp/asmlink.cmi \
     utils/clflags.cmo utils/config.cmi driver/optcompile.cmi \
     driver/opterrors.cmi asmcomp/printmach.cmi utils/warnings.cmi \
@@ -650,48 +656,45 @@ toplevel/expunge.cmo: bytecomp/bytesections.cmi typing/ident.cmi \
 toplevel/expunge.cmx: bytecomp/bytesections.cmx typing/ident.cmx \
     utils/misc.cmx bytecomp/runtimedef.cmx bytecomp/symtable.cmx 
 toplevel/genprintval.cmo: typing/btype.cmi typing/ctype.cmi \
-    typing/datarepr.cmi typing/env.cmi typing/ident.cmi \
-    typing/outcometree.cmi parsing/longident.cmi \
-    utils/misc.cmi typing/path.cmi typing/predef.cmi typing/printtyp.cmi \
-    typing/types.cmi toplevel/genprintval.cmi 
+    typing/datarepr.cmi typing/env.cmi typing/ident.cmi parsing/longident.cmi \
+    utils/misc.cmi typing/outcometree.cmi typing/path.cmi typing/predef.cmi \
+    typing/printtyp.cmi typing/types.cmi toplevel/genprintval.cmi 
 toplevel/genprintval.cmx: typing/btype.cmx typing/ctype.cmx \
     typing/datarepr.cmx typing/env.cmx typing/ident.cmx parsing/longident.cmx \
-    utils/misc.cmx typing/path.cmx typing/predef.cmx typing/printtyp.cmx \
-    typing/types.cmx toplevel/genprintval.cmi 
+    utils/misc.cmx typing/outcometree.cmi typing/path.cmx typing/predef.cmx \
+    typing/printtyp.cmx typing/types.cmx toplevel/genprintval.cmi 
 toplevel/topdirs.cmo: bytecomp/bytelink.cmi utils/clflags.cmo \
     utils/config.cmi typing/ctype.cmi bytecomp/emitcode.cmi typing/env.cmi \
     typing/ident.cmi parsing/longident.cmi bytecomp/meta.cmi utils/misc.cmi \
-    bytecomp/opcodes.cmo typing/path.cmi typing/predef.cmi \
-    typing/printtyp.cmi bytecomp/symtable.cmi toplevel/toploop.cmi \
-    toplevel/trace.cmi typing/types.cmi utils/warnings.cmi \
-    toplevel/topdirs.cmi 
+    bytecomp/opcodes.cmo typing/path.cmi typing/printtyp.cmi \
+    bytecomp/symtable.cmi toplevel/toploop.cmi toplevel/trace.cmi \
+    typing/types.cmi utils/warnings.cmi toplevel/topdirs.cmi 
 toplevel/topdirs.cmx: bytecomp/bytelink.cmx utils/clflags.cmx \
     utils/config.cmx typing/ctype.cmx bytecomp/emitcode.cmx typing/env.cmx \
     typing/ident.cmx parsing/longident.cmx bytecomp/meta.cmx utils/misc.cmx \
-    bytecomp/opcodes.cmx typing/path.cmx typing/predef.cmx \
-    typing/printtyp.cmx bytecomp/symtable.cmx toplevel/toploop.cmx \
-    toplevel/trace.cmx typing/types.cmx utils/warnings.cmx \
-    toplevel/topdirs.cmi 
+    bytecomp/opcodes.cmx typing/path.cmx typing/printtyp.cmx \
+    bytecomp/symtable.cmx toplevel/toploop.cmx toplevel/trace.cmx \
+    typing/types.cmx utils/warnings.cmx toplevel/topdirs.cmi 
 toplevel/toploop.cmo: bytecomp/bytegen.cmi utils/clflags.cmo \
     driver/compile.cmi utils/config.cmi bytecomp/emitcode.cmi typing/env.cmi \
     driver/errors.cmi toplevel/genprintval.cmi typing/ident.cmi \
     parsing/lexer.cmi parsing/location.cmi parsing/longident.cmi \
-    bytecomp/meta.cmi utils/misc.cmi parsing/parse.cmi parsing/parsetree.cmi \
-    typing/path.cmi typing/predef.cmi parsing/printast.cmi \
-    bytecomp/printinstr.cmi bytecomp/printlambda.cmi typing/printtyp.cmi \
-    bytecomp/simplif.cmi bytecomp/symtable.cmi bytecomp/translmod.cmi \
-    typing/typedtree.cmi typing/typemod.cmi typing/types.cmi \
-    utils/warnings.cmi toplevel/toploop.cmi 
+    bytecomp/meta.cmi utils/misc.cmi typing/outcometree.cmi parsing/parse.cmi \
+    parsing/parsetree.cmi typing/path.cmi typing/predef.cmi \
+    parsing/printast.cmi bytecomp/printinstr.cmi bytecomp/printlambda.cmi \
+    typing/printtyp.cmi bytecomp/simplif.cmi bytecomp/symtable.cmi \
+    bytecomp/translmod.cmi typing/typedtree.cmi typing/typemod.cmi \
+    typing/types.cmi utils/warnings.cmi toplevel/toploop.cmi 
 toplevel/toploop.cmx: bytecomp/bytegen.cmx utils/clflags.cmx \
     driver/compile.cmx utils/config.cmx bytecomp/emitcode.cmx typing/env.cmx \
     driver/errors.cmx toplevel/genprintval.cmx typing/ident.cmx \
     parsing/lexer.cmx parsing/location.cmx parsing/longident.cmx \
-    bytecomp/meta.cmx utils/misc.cmx parsing/parse.cmx parsing/parsetree.cmi \
-    typing/path.cmx typing/predef.cmx parsing/printast.cmx \
-    bytecomp/printinstr.cmx bytecomp/printlambda.cmx typing/printtyp.cmx \
-    bytecomp/simplif.cmx bytecomp/symtable.cmx bytecomp/translmod.cmx \
-    typing/typedtree.cmx typing/typemod.cmx typing/types.cmx \
-    utils/warnings.cmx toplevel/toploop.cmi 
+    bytecomp/meta.cmx utils/misc.cmx typing/outcometree.cmi parsing/parse.cmx \
+    parsing/parsetree.cmi typing/path.cmx typing/predef.cmx \
+    parsing/printast.cmx bytecomp/printinstr.cmx bytecomp/printlambda.cmx \
+    typing/printtyp.cmx bytecomp/simplif.cmx bytecomp/symtable.cmx \
+    bytecomp/translmod.cmx typing/typedtree.cmx typing/typemod.cmx \
+    typing/types.cmx utils/warnings.cmx toplevel/toploop.cmi 
 toplevel/topmain.cmo: utils/clflags.cmo utils/config.cmi utils/misc.cmi \
     toplevel/toploop.cmi utils/warnings.cmi 
 toplevel/topmain.cmx: utils/clflags.cmx utils/config.cmx utils/misc.cmx \
diff --git a/byterun/.depend b/byterun/.depend
index 0d8306dfb..7b495bf37 100644
--- a/byterun/.depend
+++ b/byterun/.depend
@@ -16,18 +16,6 @@ compact.o: compact.c config.h ../config/m.h ../config/s.h finalise.h \
 compare.o: compare.c custom.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
-comparegr.o: comparegr.c custom.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
-comparegraph.o: comparegraph.c custom.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
-comparesafe.o: comparesafe.c custom.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
-comparest.o: comparest.c custom.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
 custom.o: custom.c alloc.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
@@ -146,18 +134,6 @@ compact.d.o: compact.c config.h ../config/m.h ../config/s.h finalise.h \
 compare.d.o: compare.c custom.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
-comparegr.d.o: comparegr.c custom.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
-comparegraph.d.o: comparegraph.c custom.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
-comparesafe.d.o: comparesafe.c custom.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
-comparest.d.o: comparest.c custom.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
 custom.d.o: custom.c alloc.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
diff --git a/debugger/.depend b/debugger/.depend
index 4f59129ed..24873d12f 100644
--- a/debugger/.depend
+++ b/debugger/.depend
@@ -93,13 +93,13 @@ lexer.cmx: parser.cmx primitives.cmx
 loadprinter.cmo: ../utils/config.cmi ../typing/ctype.cmi debugger_config.cmi \
     ../otherlibs/dynlink/dynlink.cmi ../typing/env.cmi ../typing/ident.cmi \
     ../parsing/longident.cmi ../utils/misc.cmi ../typing/path.cmi \
-    ../typing/predef.cmi ../typing/printtyp.cmi printval.cmi \
-    ../bytecomp/symtable.cmi ../typing/types.cmi loadprinter.cmi 
+    ../typing/printtyp.cmi printval.cmi ../bytecomp/symtable.cmi \
+    ../typing/types.cmi loadprinter.cmi 
 loadprinter.cmx: ../utils/config.cmx ../typing/ctype.cmx debugger_config.cmx \
     ../otherlibs/dynlink/dynlink.cmx ../typing/env.cmx ../typing/ident.cmx \
     ../parsing/longident.cmx ../utils/misc.cmx ../typing/path.cmx \
-    ../typing/predef.cmx ../typing/printtyp.cmx printval.cmx \
-    ../bytecomp/symtable.cmx ../typing/types.cmx loadprinter.cmi 
+    ../typing/printtyp.cmx printval.cmx ../bytecomp/symtable.cmx \
+    ../typing/types.cmx loadprinter.cmi 
 main.cmo: checkpoints.cmi command_line.cmi ../utils/config.cmi \
     debugger_config.cmi exec.cmi frames.cmi input_handling.cmi \
     ../utils/misc.cmi parameters.cmi primitives.cmi program_management.cmi \
@@ -125,11 +125,13 @@ pattern_matching.cmx: ../typing/ctype.cmx debugcom.cmx debugger_config.cmx \
 primitives.cmo: ../otherlibs/unix/unix.cmi primitives.cmi 
 primitives.cmx: ../otherlibs/unix/unix.cmx primitives.cmi 
 printval.cmo: debugcom.cmi ../toplevel/genprintval.cmi ../utils/misc.cmi \
-    parser_aux.cmi ../typing/path.cmi ../typing/printtyp.cmi \
-    ../bytecomp/symtable.cmi ../typing/types.cmi printval.cmi 
+    ../typing/outcometree.cmi parser_aux.cmi ../typing/path.cmi \
+    ../typing/printtyp.cmi ../bytecomp/symtable.cmi ../typing/types.cmi \
+    printval.cmi 
 printval.cmx: debugcom.cmx ../toplevel/genprintval.cmx ../utils/misc.cmx \
-    parser_aux.cmi ../typing/path.cmx ../typing/printtyp.cmx \
-    ../bytecomp/symtable.cmx ../typing/types.cmx printval.cmi 
+    ../typing/outcometree.cmi parser_aux.cmi ../typing/path.cmx \
+    ../typing/printtyp.cmx ../bytecomp/symtable.cmx ../typing/types.cmx \
+    printval.cmi 
 program_loading.cmo: debugger_config.cmi input_handling.cmi ../utils/misc.cmi \
     parameters.cmi primitives.cmi ../otherlibs/unix/unix.cmi unix_tools.cmi \
     program_loading.cmi 
diff --git a/otherlibs/systhreads/.depend b/otherlibs/systhreads/.depend
index 5863f3ee1..f1d90923b 100644
--- a/otherlibs/systhreads/.depend
+++ b/otherlibs/systhreads/.depend
@@ -1,18 +1,20 @@
 posix.o: posix.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/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/roots.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/printexc.h ../../byterun/roots.h \
  ../../byterun/signals.h ../../byterun/stacks.h ../../byterun/sys.h
 win32.o: win32.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/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/roots.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/printexc.h ../../byterun/roots.h \
  ../../byterun/signals.h ../../byterun/stacks.h ../../byterun/sys.h
 condition.cmi: mutex.cmi 
 condition.cmo: mutex.cmi condition.cmi 
diff --git a/tools/.depend b/tools/.depend
index c2547b1ad..f2593d625 100644
--- a/tools/.depend
+++ b/tools/.depend
@@ -14,10 +14,10 @@ objinfo.cmo: ../utils/config.cmi ../bytecomp/emitcode.cmi
 objinfo.cmx: ../utils/config.cmx ../bytecomp/emitcode.cmx 
 ocamlcp.cmo: ../driver/main_args.cmi 
 ocamlcp.cmx: ../driver/main_args.cmx 
-ocamldep.cmo: ../utils/clflags.cmo ../parsing/lexer.cmi \
+ocamldep.cmo: ../utils/clflags.cmo ../utils/config.cmi ../parsing/lexer.cmi \
     ../parsing/location.cmi ../parsing/longident.cmi ../utils/misc.cmi \
     ../parsing/parse.cmi ../parsing/parsetree.cmi ../parsing/syntaxerr.cmi 
-ocamldep.cmx: ../utils/clflags.cmx ../parsing/lexer.cmx \
+ocamldep.cmx: ../utils/clflags.cmx ../utils/config.cmx ../parsing/lexer.cmx \
     ../parsing/location.cmx ../parsing/longident.cmx ../utils/misc.cmx \
     ../parsing/parse.cmx ../parsing/parsetree.cmi ../parsing/syntaxerr.cmx 
 ocamlprof.cmo: ../utils/clflags.cmo ../utils/config.cmi ../parsing/lexer.cmi \