Fix Makefiles

2015-12-18 17:00:46 +00:00 · 2015-12-18 17:00:46 +00:00 · a972d4df72
parent 14f68921c3
commit a972d4df72
7 changed files with 115 additions and 82 deletions
--- a/.depend
+++ b/.depend
@ -2,7 +2,9 @@ utils/ccomp.cmi :
 utils/clflags.cmi :
 utils/config.cmi :
 utils/consistbl.cmi :
+utils/identifiable.cmi :
 utils/misc.cmi : utils/clflags.cmi
+utils/numbers.cmi : utils/identifiable.cmi
 utils/tbl.cmi :
 utils/terminfo.cmi :
 utils/warnings.cmi :
@ -16,8 +18,12 @@ utils/config.cmo : utils/config.cmi
 utils/config.cmx : utils/config.cmi
 utils/consistbl.cmo : utils/consistbl.cmi
 utils/consistbl.cmx : utils/consistbl.cmi
+utils/identifiable.cmo : utils/misc.cmi utils/identifiable.cmi
+utils/identifiable.cmx : utils/misc.cmx utils/identifiable.cmi
 utils/misc.cmo : utils/clflags.cmi utils/misc.cmi
 utils/misc.cmx : utils/clflags.cmx utils/misc.cmi
+utils/numbers.cmo : utils/identifiable.cmi utils/numbers.cmi
+utils/numbers.cmx : utils/identifiable.cmx utils/numbers.cmi
 utils/tbl.cmo : utils/tbl.cmi
 utils/tbl.cmx : utils/tbl.cmi
 utils/terminfo.cmo : utils/terminfo.cmi
@ -119,10 +125,10 @@ typing/cmt_format.cmi : typing/types.cmi typing/typedtree.cmi \
 typing/ctype.cmi : typing/types.cmi typing/path.cmi parsing/longident.cmi \
    typing/ident.cmi typing/env.cmi parsing/asttypes.cmi
 typing/datarepr.cmi : typing/types.cmi typing/path.cmi typing/ident.cmi
+typing/envaux.cmi : typing/subst.cmi typing/path.cmi typing/env.cmi
 typing/env.cmi : utils/warnings.cmi typing/types.cmi typing/subst.cmi \
    typing/path.cmi parsing/longident.cmi parsing/location.cmi \
    typing/ident.cmi utils/consistbl.cmi parsing/asttypes.cmi
-typing/envaux.cmi : typing/subst.cmi typing/path.cmi typing/env.cmi
 typing/ident.cmi :
 typing/includeclass.cmi : typing/types.cmi typing/env.cmi typing/ctype.cmi
 typing/includecore.cmi : typing/types.cmi typing/typedtree.cmi \
@ -141,10 +147,10 @@ typing/path.cmi : typing/ident.cmi
 typing/predef.cmi : typing/types.cmi typing/path.cmi typing/ident.cmi
 typing/primitive.cmi : parsing/parsetree.cmi typing/outcometree.cmi \
    parsing/location.cmi
+typing/printtyped.cmi : typing/typedtree.cmi
 typing/printtyp.cmi : typing/types.cmi typing/path.cmi \
    typing/outcometree.cmi parsing/longident.cmi typing/ident.cmi \
    typing/env.cmi parsing/asttypes.cmi
-typing/printtyped.cmi : typing/typedtree.cmi
 typing/stypes.cmi : typing/typedtree.cmi parsing/location.cmi \
    typing/annot.cmi
 typing/subst.cmi : typing/types.cmi typing/path.cmi typing/ident.cmi
@ -160,11 +166,11 @@ typing/typedecl.cmi : typing/types.cmi typing/typedtree.cmi typing/path.cmi \
    parsing/parsetree.cmi parsing/longident.cmi parsing/location.cmi \
    typing/includecore.cmi typing/ident.cmi typing/env.cmi \
    parsing/asttypes.cmi
+typing/typedtreeIter.cmi : typing/typedtree.cmi parsing/asttypes.cmi
+typing/typedtreeMap.cmi : typing/typedtree.cmi
 typing/typedtree.cmi : typing/types.cmi typing/primitive.cmi typing/path.cmi \
    parsing/parsetree.cmi parsing/longident.cmi parsing/location.cmi \
    typing/ident.cmi typing/env.cmi parsing/asttypes.cmi
-typing/typedtreeIter.cmi : typing/typedtree.cmi parsing/asttypes.cmi
-typing/typedtreeMap.cmi : typing/typedtree.cmi
 typing/typemod.cmi : typing/types.cmi typing/typedtree.cmi typing/path.cmi \
    parsing/parsetree.cmi parsing/longident.cmi parsing/location.cmi \
    typing/includemod.cmi typing/ident.cmi typing/env.cmi \
@ -208,6 +214,12 @@ typing/datarepr.cmo : typing/types.cmi typing/path.cmi parsing/location.cmi \
 typing/datarepr.cmx : typing/types.cmx typing/path.cmx parsing/location.cmx \
    typing/ident.cmx typing/btype.cmx parsing/asttypes.cmi \
    typing/datarepr.cmi
+typing/envaux.cmo : typing/types.cmi typing/subst.cmi typing/printtyp.cmi \
+    typing/path.cmi utils/misc.cmi typing/ident.cmi typing/env.cmi \
+    parsing/asttypes.cmi typing/envaux.cmi
+typing/envaux.cmx : typing/types.cmx typing/subst.cmx typing/printtyp.cmx \
+    typing/path.cmx utils/misc.cmx typing/ident.cmx typing/env.cmx \
+    parsing/asttypes.cmi typing/envaux.cmi
 typing/env.cmo : utils/warnings.cmi typing/types.cmi utils/tbl.cmi \
    typing/subst.cmi typing/predef.cmi typing/path.cmi utils/misc.cmi \
    parsing/longident.cmi parsing/location.cmi typing/ident.cmi \
@ -220,12 +232,6 @@ typing/env.cmx : utils/warnings.cmx typing/types.cmx utils/tbl.cmx \
    typing/datarepr.cmx utils/consistbl.cmx utils/config.cmx \
    typing/cmi_format.cmx utils/clflags.cmx parsing/builtin_attributes.cmx \
    typing/btype.cmx parsing/asttypes.cmi typing/env.cmi
-typing/envaux.cmo : typing/types.cmi typing/subst.cmi typing/printtyp.cmi \
-    typing/path.cmi utils/misc.cmi typing/ident.cmi typing/env.cmi \
-    parsing/asttypes.cmi typing/envaux.cmi
-typing/envaux.cmx : typing/types.cmx typing/subst.cmx typing/printtyp.cmx \
-    typing/path.cmx utils/misc.cmx typing/ident.cmx typing/env.cmx \
-    parsing/asttypes.cmi typing/envaux.cmi
 typing/ident.cmo : typing/ident.cmi
 typing/ident.cmx : typing/ident.cmi
 typing/includeclass.cmo : typing/types.cmi typing/printtyp.cmi \
@ -265,17 +271,17 @@ typing/oprint.cmo : typing/outcometree.cmi parsing/asttypes.cmi \
 typing/oprint.cmx : typing/outcometree.cmi parsing/asttypes.cmi \
    typing/oprint.cmi
 typing/parmatch.cmo : utils/warnings.cmi typing/untypeast.cmi \
-    typing/types.cmi typing/typedtree.cmi typing/subst.cmi typing/predef.cmi \
-    typing/path.cmi parsing/parsetree.cmi utils/misc.cmi \
-    parsing/longident.cmi parsing/location.cmi typing/ident.cmi \
-    typing/env.cmi typing/ctype.cmi typing/btype.cmi parsing/asttypes.cmi \
-    parsing/ast_helper.cmi typing/parmatch.cmi
+    typing/types.cmi typing/typedtreeIter.cmi typing/typedtree.cmi \
+    typing/subst.cmi typing/predef.cmi typing/path.cmi parsing/parsetree.cmi \
+    utils/misc.cmi parsing/longident.cmi parsing/location.cmi \
+    typing/ident.cmi typing/env.cmi typing/ctype.cmi typing/btype.cmi \
+    parsing/asttypes.cmi parsing/ast_helper.cmi typing/parmatch.cmi
 typing/parmatch.cmx : utils/warnings.cmx typing/untypeast.cmx \
-    typing/types.cmx typing/typedtree.cmx typing/subst.cmx typing/predef.cmx \
-    typing/path.cmx parsing/parsetree.cmi utils/misc.cmx \
-    parsing/longident.cmx parsing/location.cmx typing/ident.cmx \
-    typing/env.cmx typing/ctype.cmx typing/btype.cmx parsing/asttypes.cmi \
-    parsing/ast_helper.cmx typing/parmatch.cmi
+    typing/types.cmx typing/typedtreeIter.cmx typing/typedtree.cmx \
+    typing/subst.cmx typing/predef.cmx typing/path.cmx parsing/parsetree.cmi \
+    utils/misc.cmx parsing/longident.cmx parsing/location.cmx \
+    typing/ident.cmx typing/env.cmx typing/ctype.cmx typing/btype.cmx \
+    parsing/asttypes.cmi parsing/ast_helper.cmx typing/parmatch.cmi
 typing/path.cmo : typing/ident.cmi typing/path.cmi
 typing/path.cmx : typing/ident.cmx typing/path.cmi
 typing/predef.cmo : typing/types.cmi typing/path.cmi parsing/parsetree.cmi \
@ -290,6 +296,12 @@ typing/primitive.cmo : utils/warnings.cmi parsing/parsetree.cmi \
 typing/primitive.cmx : utils/warnings.cmx parsing/parsetree.cmi \
    typing/outcometree.cmi utils/misc.cmx parsing/location.cmx \
    parsing/attr_helper.cmx typing/primitive.cmi
+typing/printtyped.cmo : typing/typedtree.cmi parsing/printast.cmi \
+    typing/path.cmi utils/misc.cmi parsing/longident.cmi parsing/location.cmi \
+    typing/ident.cmi parsing/asttypes.cmi typing/printtyped.cmi
+typing/printtyped.cmx : typing/typedtree.cmx parsing/printast.cmx \
+    typing/path.cmx utils/misc.cmx parsing/longident.cmx parsing/location.cmx \
+    typing/ident.cmx parsing/asttypes.cmi typing/printtyped.cmi
 typing/printtyp.cmo : typing/types.cmi typing/primitive.cmi \
    typing/predef.cmi typing/path.cmi parsing/parsetree.cmi \
    typing/outcometree.cmi typing/oprint.cmi utils/misc.cmi \
@ -302,12 +314,6 @@ typing/printtyp.cmx : typing/types.cmx typing/primitive.cmx \
    parsing/longident.cmx parsing/location.cmx typing/ident.cmx \
    typing/env.cmx typing/ctype.cmx utils/clflags.cmx typing/btype.cmx \
    parsing/asttypes.cmi typing/printtyp.cmi
-typing/printtyped.cmo : typing/typedtree.cmi parsing/printast.cmi \
-    typing/path.cmi utils/misc.cmi parsing/longident.cmi parsing/location.cmi \
-    typing/ident.cmi parsing/asttypes.cmi typing/printtyped.cmi
-typing/printtyped.cmx : typing/typedtree.cmx parsing/printast.cmx \
-    typing/path.cmx utils/misc.cmx parsing/longident.cmx parsing/location.cmx \
-    typing/ident.cmx parsing/asttypes.cmi typing/printtyped.cmi
 typing/stypes.cmo : typing/typedtree.cmi typing/printtyp.cmi \
    parsing/location.cmi utils/clflags.cmi typing/annot.cmi typing/stypes.cmi
 typing/stypes.cmx : typing/typedtree.cmx typing/printtyp.cmx \
@ -376,14 +382,6 @@ typing/typedecl.cmx : utils/warnings.cmx typing/typetexp.cmx \
    typing/ident.cmx typing/env.cmx typing/ctype.cmx utils/config.cmx \
    utils/clflags.cmx typing/btype.cmx parsing/attr_helper.cmx \
    parsing/asttypes.cmi parsing/ast_helper.cmx typing/typedecl.cmi
-typing/typedtree.cmo : typing/types.cmi typing/primitive.cmi typing/path.cmi \
-    parsing/parsetree.cmi utils/misc.cmi parsing/longident.cmi \
-    parsing/location.cmi typing/ident.cmi typing/env.cmi parsing/asttypes.cmi \
-    typing/typedtree.cmi
-typing/typedtree.cmx : typing/types.cmx typing/primitive.cmx typing/path.cmx \
-    parsing/parsetree.cmi utils/misc.cmx parsing/longident.cmx \
-    parsing/location.cmx typing/ident.cmx typing/env.cmx parsing/asttypes.cmi \
-    typing/typedtree.cmi
 typing/typedtreeIter.cmo : typing/typedtree.cmi utils/misc.cmi \
    parsing/asttypes.cmi typing/typedtreeIter.cmi
 typing/typedtreeIter.cmx : typing/typedtree.cmx utils/misc.cmx \
@ -392,6 +390,14 @@ typing/typedtreeMap.cmo : typing/typedtree.cmi utils/misc.cmi \
    typing/typedtreeMap.cmi
 typing/typedtreeMap.cmx : typing/typedtree.cmx utils/misc.cmx \
    typing/typedtreeMap.cmi
+typing/typedtree.cmo : typing/types.cmi typing/primitive.cmi typing/path.cmi \
+    parsing/parsetree.cmi utils/misc.cmi parsing/longident.cmi \
+    parsing/location.cmi typing/ident.cmi typing/env.cmi parsing/asttypes.cmi \
+    typing/typedtree.cmi
+typing/typedtree.cmx : typing/types.cmx typing/primitive.cmx typing/path.cmx \
+    parsing/parsetree.cmi utils/misc.cmx parsing/longident.cmx \
+    parsing/location.cmx typing/ident.cmx typing/env.cmx parsing/asttypes.cmi \
+    typing/typedtree.cmi
 typing/typemod.cmo : utils/warnings.cmi typing/typetexp.cmi typing/types.cmi \
    typing/typedtree.cmi typing/typedecl.cmi typing/typecore.cmi \
    typing/typeclass.cmi typing/subst.cmi typing/stypes.cmi \
@ -625,13 +631,15 @@ bytecomp/translmod.cmo : typing/types.cmi typing/typedtree.cmi \
    typing/printtyp.cmi typing/primitive.cmi typing/predef.cmi \
    typing/path.cmi typing/mtype.cmi utils/misc.cmi parsing/longident.cmi \
    parsing/location.cmi bytecomp/lambda.cmi typing/ident.cmi typing/env.cmi \
-    typing/ctype.cmi parsing/asttypes.cmi bytecomp/translmod.cmi
+    typing/ctype.cmi utils/clflags.cmi parsing/asttypes.cmi \
+    bytecomp/translmod.cmi
 bytecomp/translmod.cmx : typing/types.cmx typing/typedtree.cmx \
    bytecomp/translobj.cmx bytecomp/translcore.cmx bytecomp/translclass.cmx \
    typing/printtyp.cmx typing/primitive.cmx typing/predef.cmx \
    typing/path.cmx typing/mtype.cmx utils/misc.cmx parsing/longident.cmx \
    parsing/location.cmx bytecomp/lambda.cmx typing/ident.cmx typing/env.cmx \
-    typing/ctype.cmx parsing/asttypes.cmi bytecomp/translmod.cmi
+    typing/ctype.cmx utils/clflags.cmx parsing/asttypes.cmi \
+    bytecomp/translmod.cmi
 bytecomp/translobj.cmo : typing/primitive.cmi utils/misc.cmi \
    parsing/longident.cmi bytecomp/lambda.cmi typing/ident.cmi typing/env.cmi \
    utils/clflags.cmi typing/btype.cmi parsing/asttypes.cmi \
@ -642,11 +650,10 @@ bytecomp/translobj.cmx : typing/primitive.cmx utils/misc.cmx \
    bytecomp/translobj.cmi
 bytecomp/typeopt.cmo : typing/types.cmi typing/typedtree.cmi \
    typing/predef.cmi typing/path.cmi bytecomp/lambda.cmi typing/ident.cmi \
-    typing/env.cmi typing/ctype.cmi bytecomp/typeopt.cmi
+    typing/env.cmi typing/ctype.cmi typing/btype.cmi bytecomp/typeopt.cmi
 bytecomp/typeopt.cmx : typing/types.cmx typing/typedtree.cmx \
    typing/predef.cmx typing/path.cmx bytecomp/lambda.cmx typing/ident.cmx \
-    typing/env.cmx typing/ctype.cmx bytecomp/typeopt.cmi
-asmcomp/CSEgen.cmi : asmcomp/mach.cmi
+    typing/env.cmx typing/ctype.cmx typing/btype.cmx bytecomp/typeopt.cmi
 asmcomp/asmgen.cmi : bytecomp/lambda.cmi asmcomp/cmm.cmi
 asmcomp/asmlibrarian.cmi :
 asmcomp/asmlink.cmi : asmcomp/cmx_format.cmi
@ -656,18 +663,19 @@ asmcomp/branch_relaxation.cmi : asmcomp/linearize.cmi \
 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 : bytecomp/lambda.cmi typing/ident.cmi asmcomp/debuginfo.cmi
 asmcomp/cmmgen.cmi : asmcomp/cmx_format.cmi asmcomp/cmm.cmi \
    asmcomp/clambda.cmi
+asmcomp/cmm.cmi : bytecomp/lambda.cmi typing/ident.cmi asmcomp/debuginfo.cmi
 asmcomp/cmx_format.cmi : asmcomp/clambda.cmi
 asmcomp/coloring.cmi :
 asmcomp/comballoc.cmi : asmcomp/mach.cmi
 asmcomp/compilenv.cmi : typing/ident.cmi asmcomp/cmx_format.cmi \
    asmcomp/clambda.cmi
+asmcomp/CSEgen.cmi : asmcomp/mach.cmi
 asmcomp/deadcode.cmi : asmcomp/mach.cmi
 asmcomp/debuginfo.cmi : parsing/location.cmi bytecomp/lambda.cmi
-asmcomp/emit.cmi : asmcomp/linearize.cmi asmcomp/cmm.cmi
 asmcomp/emitaux.cmi : asmcomp/debuginfo.cmi
+asmcomp/emit.cmi : asmcomp/linearize.cmi asmcomp/cmm.cmi
 asmcomp/interf.cmi : asmcomp/mach.cmi
 asmcomp/linearize.cmi : asmcomp/reg.cmi asmcomp/mach.cmi bytecomp/lambda.cmi \
    asmcomp/debuginfo.cmi
@ -680,8 +688,8 @@ asmcomp/printlinear.cmi : asmcomp/linearize.cmi
 asmcomp/printmach.cmi : asmcomp/reg.cmi asmcomp/mach.cmi
 asmcomp/proc.cmi : asmcomp/reg.cmi asmcomp/mach.cmi
 asmcomp/reg.cmi : typing/ident.cmi asmcomp/cmm.cmi
-asmcomp/reload.cmi : asmcomp/mach.cmi
 asmcomp/reloadgen.cmi : asmcomp/reg.cmi asmcomp/mach.cmi
+asmcomp/reload.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 \
@ -695,12 +703,6 @@ asmcomp/x86_dsl.cmi : asmcomp/x86_ast.cmi
 asmcomp/x86_gas.cmi : asmcomp/x86_ast.cmi
 asmcomp/x86_masm.cmi : asmcomp/x86_ast.cmi
 asmcomp/x86_proc.cmi : asmcomp/x86_ast.cmi
-asmcomp/CSE.cmo : asmcomp/mach.cmi asmcomp/CSEgen.cmi asmcomp/arch.cmo
-asmcomp/CSE.cmx : asmcomp/mach.cmx asmcomp/CSEgen.cmx asmcomp/arch.cmx
-asmcomp/CSEgen.cmo : asmcomp/reg.cmi asmcomp/proc.cmi asmcomp/mach.cmi \
-    asmcomp/cmm.cmi asmcomp/CSEgen.cmi
-asmcomp/CSEgen.cmx : asmcomp/reg.cmx asmcomp/proc.cmx asmcomp/mach.cmx \
-    asmcomp/cmm.cmx asmcomp/CSEgen.cmi
 asmcomp/arch.cmo : utils/clflags.cmi
 asmcomp/arch.cmx : utils/clflags.cmx
 asmcomp/asmgen.cmo : bytecomp/translmod.cmi asmcomp/split.cmi \
@ -751,14 +753,14 @@ asmcomp/asmpackager.cmx : typing/typemod.cmx bytecomp/translmod.cmx \
    utils/config.cmx asmcomp/compilenv.cmx asmcomp/cmx_format.cmi \
    utils/clflags.cmx utils/ccomp.cmx asmcomp/asmlink.cmx asmcomp/asmgen.cmx \
    asmcomp/asmpackager.cmi
+asmcomp/branch_relaxation_intf.cmo : asmcomp/linearize.cmi asmcomp/arch.cmo
+asmcomp/branch_relaxation_intf.cmx : asmcomp/linearize.cmx asmcomp/arch.cmx
 asmcomp/branch_relaxation.cmo : utils/misc.cmi asmcomp/mach.cmi \
    asmcomp/linearize.cmi asmcomp/cmm.cmi asmcomp/branch_relaxation_intf.cmo \
    asmcomp/branch_relaxation.cmi
 asmcomp/branch_relaxation.cmx : utils/misc.cmx asmcomp/mach.cmx \
    asmcomp/linearize.cmx asmcomp/cmm.cmx asmcomp/branch_relaxation_intf.cmx \
    asmcomp/branch_relaxation.cmi
-asmcomp/branch_relaxation_intf.cmo : asmcomp/linearize.cmi asmcomp/arch.cmo
-asmcomp/branch_relaxation_intf.cmx : asmcomp/linearize.cmx asmcomp/arch.cmx
 asmcomp/clambda.cmo : bytecomp/lambda.cmi typing/ident.cmi \
    asmcomp/debuginfo.cmi parsing/asttypes.cmi asmcomp/clambda.cmi
 asmcomp/clambda.cmx : bytecomp/lambda.cmx typing/ident.cmx \
@ -773,10 +775,6 @@ asmcomp/closure.cmx : utils/warnings.cmx utils/tbl.cmx bytecomp/switch.cmx \
    bytecomp/lambda.cmx typing/ident.cmx asmcomp/debuginfo.cmx \
    asmcomp/compilenv.cmx utils/clflags.cmx asmcomp/clambda.cmx \
    parsing/asttypes.cmi asmcomp/arch.cmx asmcomp/closure.cmi
-asmcomp/cmm.cmo : bytecomp/lambda.cmi typing/ident.cmi asmcomp/debuginfo.cmi \
-    asmcomp/arch.cmo asmcomp/cmm.cmi
-asmcomp/cmm.cmx : bytecomp/lambda.cmx typing/ident.cmx asmcomp/debuginfo.cmx \
-    asmcomp/arch.cmx asmcomp/cmm.cmi
 asmcomp/cmmgen.cmo : typing/types.cmi bytecomp/switch.cmi \
    asmcomp/strmatch.cmi asmcomp/proc.cmi typing/primitive.cmi utils/misc.cmi \
    bytecomp/lambda.cmi typing/ident.cmi asmcomp/debuginfo.cmi \
@ -789,6 +787,10 @@ asmcomp/cmmgen.cmx : typing/types.cmx bytecomp/switch.cmx \
    utils/config.cmx asmcomp/compilenv.cmx 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 : bytecomp/lambda.cmi typing/ident.cmi asmcomp/debuginfo.cmi \
+    asmcomp/arch.cmo asmcomp/cmm.cmi
+asmcomp/cmm.cmx : bytecomp/lambda.cmx typing/ident.cmx asmcomp/debuginfo.cmx \
+    asmcomp/arch.cmx asmcomp/cmm.cmi
 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 \
@ -801,6 +803,12 @@ asmcomp/compilenv.cmo : utils/misc.cmi parsing/location.cmi typing/ident.cmi \
 asmcomp/compilenv.cmx : utils/misc.cmx parsing/location.cmx typing/ident.cmx \
    typing/env.cmx utils/config.cmx asmcomp/cmx_format.cmi \
    asmcomp/clambda.cmx asmcomp/compilenv.cmi
+asmcomp/CSEgen.cmo : asmcomp/reg.cmi asmcomp/proc.cmi asmcomp/mach.cmi \
+    asmcomp/cmm.cmi asmcomp/CSEgen.cmi
+asmcomp/CSEgen.cmx : asmcomp/reg.cmx asmcomp/proc.cmx asmcomp/mach.cmx \
+    asmcomp/cmm.cmx asmcomp/CSEgen.cmi
+asmcomp/CSE.cmo : asmcomp/mach.cmi asmcomp/CSEgen.cmi asmcomp/arch.cmo
+asmcomp/CSE.cmx : asmcomp/mach.cmx asmcomp/CSEgen.cmx asmcomp/arch.cmx
 asmcomp/deadcode.cmo : asmcomp/reg.cmi asmcomp/proc.cmi asmcomp/mach.cmi \
    asmcomp/deadcode.cmi
 asmcomp/deadcode.cmx : asmcomp/reg.cmx asmcomp/proc.cmx asmcomp/mach.cmx \
@ -809,6 +817,10 @@ asmcomp/debuginfo.cmo : parsing/location.cmi bytecomp/lambda.cmi \
    asmcomp/debuginfo.cmi
 asmcomp/debuginfo.cmx : parsing/location.cmx bytecomp/lambda.cmx \
    asmcomp/debuginfo.cmi
+asmcomp/emitaux.cmo : asmcomp/linearize.cmi asmcomp/debuginfo.cmi \
+    utils/config.cmi utils/clflags.cmi asmcomp/arch.cmo asmcomp/emitaux.cmi
+asmcomp/emitaux.cmx : asmcomp/linearize.cmx asmcomp/debuginfo.cmx \
+    utils/config.cmx utils/clflags.cmx asmcomp/arch.cmx asmcomp/emitaux.cmi
 asmcomp/emit.cmo : asmcomp/x86_proc.cmi asmcomp/x86_masm.cmi \
    asmcomp/x86_gas.cmi asmcomp/x86_dsl.cmi asmcomp/x86_ast.cmi \
    asmcomp/reg.cmi asmcomp/proc.cmi utils/misc.cmi asmcomp/mach.cmi \
@ -823,10 +835,6 @@ asmcomp/emit.cmx : asmcomp/x86_proc.cmx asmcomp/x86_masm.cmx \
    asmcomp/debuginfo.cmx utils/config.cmx asmcomp/compilenv.cmx \
    asmcomp/cmm.cmx utils/clflags.cmx asmcomp/branch_relaxation.cmx \
    asmcomp/arch.cmx asmcomp/emit.cmi
-asmcomp/emitaux.cmo : asmcomp/linearize.cmi asmcomp/debuginfo.cmi \
-    utils/config.cmi utils/clflags.cmi asmcomp/arch.cmo asmcomp/emitaux.cmi
-asmcomp/emitaux.cmx : asmcomp/linearize.cmx asmcomp/debuginfo.cmx \
-    utils/config.cmx utils/clflags.cmx asmcomp/arch.cmx asmcomp/emitaux.cmi
 asmcomp/interf.cmo : asmcomp/reg.cmi asmcomp/proc.cmi asmcomp/mach.cmi \
    asmcomp/interf.cmi
 asmcomp/interf.cmx : asmcomp/reg.cmx asmcomp/proc.cmx asmcomp/mach.cmx \
@ -879,14 +887,14 @@ asmcomp/proc.cmx : asmcomp/x86_proc.cmx asmcomp/reg.cmx utils/misc.cmx \
    asmcomp/proc.cmi
 asmcomp/reg.cmo : typing/ident.cmi asmcomp/cmm.cmi asmcomp/reg.cmi
 asmcomp/reg.cmx : typing/ident.cmx asmcomp/cmm.cmx asmcomp/reg.cmi
-asmcomp/reload.cmo : asmcomp/reloadgen.cmi asmcomp/reg.cmi asmcomp/mach.cmi \
-    asmcomp/cmm.cmi utils/clflags.cmi asmcomp/reload.cmi
-asmcomp/reload.cmx : asmcomp/reloadgen.cmx asmcomp/reg.cmx asmcomp/mach.cmx \
-    asmcomp/cmm.cmx utils/clflags.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/reload.cmo : asmcomp/reloadgen.cmi asmcomp/reg.cmi asmcomp/mach.cmi \
+    asmcomp/cmm.cmi utils/clflags.cmi asmcomp/reload.cmi
+asmcomp/reload.cmx : asmcomp/reloadgen.cmx asmcomp/reg.cmx asmcomp/mach.cmx \
+    asmcomp/cmm.cmx utils/clflags.cmx asmcomp/reload.cmi
 asmcomp/schedgen.cmo : asmcomp/reg.cmi asmcomp/proc.cmi asmcomp/mach.cmi \
    asmcomp/linearize.cmi asmcomp/cmm.cmi asmcomp/arch.cmo \
    asmcomp/schedgen.cmi
@ -941,8 +949,8 @@ driver/compenv.cmi :
 driver/compile.cmi :
 driver/compmisc.cmi : typing/env.cmi
 driver/errors.cmi :
-driver/main.cmi :
 driver/main_args.cmi :
+driver/main.cmi :
 driver/optcompile.cmi :
 driver/opterrors.cmi :
 driver/optmain.cmi :
@ -979,6 +987,8 @@ driver/compmisc.cmx : typing/typemod.cmx utils/misc.cmx \
    parsing/asttypes.cmi driver/compmisc.cmi
 driver/errors.cmo : parsing/location.cmi driver/errors.cmi
 driver/errors.cmx : parsing/location.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 \
    parsing/location.cmi utils/config.cmi driver/compmisc.cmi \
    driver/compile.cmi driver/compenv.cmi utils/clflags.cmi \
@ -989,8 +999,6 @@ driver/main.cmx : utils/warnings.cmx utils/misc.cmx driver/main_args.cmx \
    driver/compile.cmx driver/compenv.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/typemod.cmi \
    typing/typedtree.cmi typing/typecore.cmi bytecomp/translmod.cmi \
    typing/stypes.cmi bytecomp/simplif.cmi typing/printtyped.cmi \
@ -1071,26 +1079,26 @@ toplevel/opttoploop.cmo : utils/warnings.cmi typing/types.cmi \
    typing/typemod.cmi typing/typedtree.cmi typing/typecore.cmi \
    bytecomp/translmod.cmi bytecomp/simplif.cmi typing/printtyped.cmi \
    typing/printtyp.cmi bytecomp/printlambda.cmi parsing/printast.cmi \
-    typing/predef.cmi parsing/pprintast.cmi typing/path.cmi \
+    typing/predef.cmi parsing/pprintast.cmi driver/pparse.cmi typing/path.cmi \
    parsing/parsetree.cmi parsing/parse.cmi typing/outcometree.cmi \
    typing/oprint.cmi utils/misc.cmi parsing/longident.cmi \
-    parsing/location.cmi parsing/lexer.cmi typing/ident.cmi \
-    toplevel/genprintval.cmi typing/env.cmi utils/config.cmi \
+    parsing/location.cmi parsing/lexer.cmi typing/includemod.cmi \
+    typing/ident.cmi toplevel/genprintval.cmi typing/env.cmi utils/config.cmi \
    driver/compmisc.cmi asmcomp/compilenv.cmi utils/clflags.cmi \
-    typing/btype.cmi asmcomp/asmlink.cmi asmcomp/asmgen.cmi \
-    toplevel/opttoploop.cmi
+    typing/btype.cmi parsing/ast_helper.cmi asmcomp/asmlink.cmi \
+    asmcomp/asmgen.cmi toplevel/opttoploop.cmi
 toplevel/opttoploop.cmx : utils/warnings.cmx typing/types.cmx \
    typing/typemod.cmx typing/typedtree.cmx typing/typecore.cmx \
    bytecomp/translmod.cmx bytecomp/simplif.cmx typing/printtyped.cmx \
    typing/printtyp.cmx bytecomp/printlambda.cmx parsing/printast.cmx \
-    typing/predef.cmx parsing/pprintast.cmx typing/path.cmx \
+    typing/predef.cmx parsing/pprintast.cmx driver/pparse.cmx typing/path.cmx \
    parsing/parsetree.cmi parsing/parse.cmx typing/outcometree.cmi \
    typing/oprint.cmx utils/misc.cmx parsing/longident.cmx \
-    parsing/location.cmx parsing/lexer.cmx typing/ident.cmx \
-    toplevel/genprintval.cmx typing/env.cmx utils/config.cmx \
+    parsing/location.cmx parsing/lexer.cmx typing/includemod.cmx \
+    typing/ident.cmx toplevel/genprintval.cmx typing/env.cmx utils/config.cmx \
    driver/compmisc.cmx asmcomp/compilenv.cmx utils/clflags.cmx \
-    typing/btype.cmx asmcomp/asmlink.cmx asmcomp/asmgen.cmx \
-    toplevel/opttoploop.cmi
+    typing/btype.cmx parsing/ast_helper.cmx asmcomp/asmlink.cmx \
+    asmcomp/asmgen.cmx toplevel/opttoploop.cmi
 toplevel/opttopmain.cmo : utils/warnings.cmi asmcomp/printmach.cmi \
    toplevel/opttoploop.cmi toplevel/opttopdirs.cmi utils/misc.cmi \
    driver/main_args.cmi parsing/location.cmi utils/config.cmi \
--- a/Makefile.shared
+++ b/Makefile.shared
@ -36,8 +36,9 @@ OCAMLDOC_OPT=$(WITH_OCAMLDOC:=.opt)
 INCLUDES=-I utils -I parsing -I typing -I bytecomp -I asmcomp -I driver \
 	 -I toplevel

-UTILS=utils/config.cmo utils/clflags.cmo \
-  utils/misc.cmo utils/tbl.cmo \
+UTILS=utils/config.cmo utils/clflags.cmo utils/misc.cmo \
+  utils/identifiable.cmo utils/numbers.cmo \
+  utils/tbl.cmo \
  utils/terminfo.cmo utils/ccomp.cmo utils/warnings.cmo \
  utils/consistbl.cmo

--- a/debugger/Makefile.shared
+++ b/debugger/Makefile.shared
@ -32,6 +32,7 @@ OTHEROBJS=\
  $(UNIXDIR)/unix.cma \
  ../utils/config.cmo ../utils/tbl.cmo \
  ../utils/clflags.cmo ../utils/misc.cmo \
+  ../utils/identifiable.cmo ../utils/numbers.cmo \
  ../utils/consistbl.cmo ../utils/warnings.cmo \
  ../utils/terminfo.cmo \
  ../parsing/location.cmo ../parsing/longident.cmo ../parsing/docstrings.cmo \
--- a/otherlibs/dynlink/Makefile
+++ b/otherlibs/dynlink/Makefile
@ -31,6 +31,7 @@ OBJS=dynlinkaux.cmo dynlink.cmo

 COMPILEROBJS=\
  ../../utils/misc.cmo ../../utils/config.cmo ../../utils/clflags.cmo \
+  ../../utils/identifiable.cmo ../../utils/numbers.cmo \
  ../../utils/tbl.cmo ../../utils/consistbl.cmo \
  ../../utils/terminfo.cmo ../../utils/warnings.cmo \
  ../../parsing/asttypes.cmi \
--- a/tools/Makefile.nt
+++ b/tools/Makefile.nt
@ -15,7 +15,7 @@ include Makefile.shared
 # To make custom toplevels

 OCAMLMKTOP=ocamlmktop.cmo
-OCAMLMKTOP_IMPORTS=misc.cmo config.cmo clflags.cmo ccomp.cmo
+OCAMLMKTOP_IMPORTS=misc.cmo identifiable.cmo numbers.cmo config.cmo clflags.cmo ccomp.cmo

 ocamlmktop: $(OCAMLMKTOP)
 	$(CAMLC) $(LINKFLAGS) -o ocamlmktop $(OCAMLMKTOP_IMPORTS) $(OCAMLMKTOP)
--- a/tools/Makefile.shared
+++ b/tools/Makefile.shared
@ -35,7 +35,8 @@ opt.opt: ocamldep.opt read_cmt.opt
 # The dependency generator

 CAMLDEP_OBJ=depend.cmo ocamldep.cmo
-CAMLDEP_IMPORTS=misc.cmo config.cmo clflags.cmo terminfo.cmo \
+CAMLDEP_IMPORTS=misc.cmo config.cmo identifiable.cmo numbers.cmo \
+  clflags.cmo terminfo.cmo \
  warnings.cmo location.cmo longident.cmo docstrings.cmo \
  syntaxerr.cmo ast_helper.cmo parser.cmo lexer.cmo parse.cmo \
  ccomp.cmo ast_mapper.cmo pparse.cmo compenv.cmo builtin_attributes.cmo
@ -65,7 +66,8 @@ install::
 # The profiler

 CSLPROF=ocamlprof.cmo
-CSLPROF_IMPORTS=misc.cmo config.cmo clflags.cmo terminfo.cmo \
+CSLPROF_IMPORTS=misc.cmo config.cmo identifiable.cmo numbers.cmo \
+  clflags.cmo terminfo.cmo \
  warnings.cmo location.cmo longident.cmo docstrings.cmo \
  syntaxerr.cmo ast_helper.cmo parser.cmo lexer.cmo parse.cmo

@ -158,7 +160,8 @@ clean::

 # Insert labels following an interface file (upgrade 3.02 to 3.03)

-ADDLABELS_IMPORTS=misc.cmo config.cmo clflags.cmo terminfo.cmo \
+ADDLABELS_IMPORTS=misc.cmo config.cmo clflags.cmo \
+  identifiable.cmo numbers.cmo terminfo.cmo \
  warnings.cmo location.cmo longident.cmo docstrings.cmo \
  syntaxerr.cmo ast_helper.cmo parser.cmo lexer.cmo parse.cmo

--- a/utils/identifiable.ml
+++ b/utils/identifiable.ml
@ -50,15 +50,34 @@ module Make_map (T : Thing) = struct
  let of_list l =
    List.fold_left (fun map (id, v) -> add id v map) empty l

+  let disjoint_union ?eq m1 m2 =
+    merge (fun id x y -> match x, y with
+        | None, None -> None
+        | None, Some v | Some v, None -> Some v
+        | Some v1, Some v2 ->
+            let ok = match eq with
+              | None -> false
+              | Some eq -> eq v1 v2 in
+            if not ok
+            then
+              let err = Format.asprintf "Map.disjoint_union %a" T.print id in
+              Misc.fatal_error err
+            else Some v1) m1 m2
+
+  (* CR mshinwell: This version is the one that should be used, but it needs
+     [Map.union] in the stdlib.
  let disjoint_union ?eq m1 m2 =
    union (fun id v1 v2 ->
        let ok = match eq with
          | None -> false
          | Some eq -> eq v1 v2
        in
-        if not ok then Misc.fatal_errorf "Map.disjoint_union %a" T.print id
+        if not ok then
+          let err = Format.asprintf "Map.disjoint_union %a" T.print id in
+          Misc.fatal_error err
        else v1)
      m1 m2
+  *)

  let union_right m1 m2 =
    merge (fun id x y -> match x, y with