pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Updated ocaml to 4.09beta2



Module Name:	pkgsrc-wip
Committed By:	Jaap Boender <jaapb%kerguelen.org@localhost>
Pushed By:	jaapb
Date:		Mon Oct 28 11:10:52 2019 +0000
Changeset:	1c22033c154f8744a1c2c1cbf529cae3e3b043e2

Modified Files:
	ocaml/Makefile.common
	ocaml/PLIST
	ocaml/distinfo
	ocaml/patches/patch-configure
	ocaml/patches/patch-lex_Makefile
	ocaml/patches/patch-tools_Makefile
Removed Files:
	ocaml/patches/patch-asmcomp_asmlink.ml
	ocaml/patches/patch-driver_compenv.ml
	ocaml/patches/patch-driver_main.ml
	ocaml/patches/patch-driver_main_args.ml
	ocaml/patches/patch-driver_main_args.mli
	ocaml/patches/patch-driver_optmain.ml
	ocaml/patches/patch-otherlibs_threads_Makefile
	ocaml/patches/patch-tools_ocamlcp.ml
	ocaml/patches/patch-tools_ocamloptp.ml
	ocaml/patches/patch-utils_clflags.ml
	ocaml/patches/patch-utils_clflags.mli

Log Message:
Updated ocaml to 4.09beta2

(Caveat emptor for the moment, haven't tested it thoroughly)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1c22033c154f8744a1c2c1cbf529cae3e3b043e2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ocaml/Makefile.common                          |   4 +-
 ocaml/PLIST                                    | 426 +++++++++++++------------
 ocaml/distinfo                                 |  25 +-
 ocaml/patches/patch-asmcomp_asmlink.ml         |  20 --
 ocaml/patches/patch-configure                  |  30 +-
 ocaml/patches/patch-driver_compenv.ml          |  12 -
 ocaml/patches/patch-driver_main.ml             |  14 -
 ocaml/patches/patch-driver_main_args.ml        |  41 ---
 ocaml/patches/patch-driver_main_args.mli       |  14 -
 ocaml/patches/patch-driver_optmain.ml          |  14 -
 ocaml/patches/patch-lex_Makefile               |   8 +-
 ocaml/patches/patch-otherlibs_threads_Makefile |  30 --
 ocaml/patches/patch-tools_Makefile             |   6 +-
 ocaml/patches/patch-tools_ocamlcp.ml           |  14 -
 ocaml/patches/patch-tools_ocamloptp.ml         |  14 -
 ocaml/patches/patch-utils_clflags.ml           |  16 -
 ocaml/patches/patch-utils_clflags.mli          |  14 -
 17 files changed, 254 insertions(+), 448 deletions(-)

diffs:
diff --git a/ocaml/Makefile.common b/ocaml/Makefile.common
index 22ebca1fc9..a410140dd8 100644
--- a/ocaml/Makefile.common
+++ b/ocaml/Makefile.common
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile.common,v 1.55 2018/11/12 16:09:34 jaapb Exp $
 
 # used by x11/labltk/Makefile
-DISTNAME=	ocaml-4.08.1+rc1
+DISTNAME=	ocaml-4.09.0+beta2
 CATEGORIES=	lang
-MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-4.08/
+MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-4.09/
 #EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jaapb%NetBSD.org@localhost
diff --git a/ocaml/PLIST b/ocaml/PLIST
index 9e37c08647..6d47a50638 100644
--- a/ocaml/PLIST
+++ b/ocaml/PLIST
@@ -30,9 +30,9 @@ ${PLIST.ocaml-opt}bin/ocamlobjinfo.opt
 ${PLIST.ocaml-opt}bin/ocamlopt
 ${PLIST.ocaml-opt}bin/ocamlopt.byte
 ${PLIST.ocaml-opt}bin/ocamlopt.opt
-bin/ocamloptp
-bin/ocamloptp.byte
-${PLIST.ocaml-opt}bin/ocamloptp.opt
+@comment 4.09 bin/ocamloptp
+@comment 4.09 bin/ocamloptp.byte
+@comment 4.09 ${PLIST.ocaml-opt}bin/ocamloptp.opt
 bin/ocamlprof
 bin/ocamlprof.byte
 ${PLIST.ocaml-opt}bin/ocamlprof.opt
@@ -92,9 +92,9 @@ lib/ocaml/caml/hash.h
 lib/ocaml/caml/hooks.h
 lib/ocaml/caml/instrtrace.h
 lib/ocaml/caml/instruct.h
-lib/ocaml/caml/int64_emul.h
-lib/ocaml/caml/int64_format.h
-lib/ocaml/caml/int64_native.h
+@comment 4.09 lib/ocaml/caml/int64_emul.h
+@comment 4.09 lib/ocaml/caml/int64_format.h
+@comment 4.09 lib/ocaml/caml/int64_native.h
 lib/ocaml/caml/interp.h
 lib/ocaml/caml/intext.h
 lib/ocaml/caml/io.h
@@ -129,46 +129,48 @@ lib/ocaml/caml/version.h
 lib/ocaml/caml/weak.h
 lib/ocaml/camlheader
 lib/ocaml/camlheader_ur
+lib/ocaml/camlheaderd
+lib/ocaml/camlheaderi
 lib/ocaml/camlinternalFormat.cmi
 lib/ocaml/camlinternalFormat.cmt
 lib/ocaml/camlinternalFormat.cmti
 ${PLIST.ocaml-opt}lib/ocaml/camlinternalFormat.cmx
 lib/ocaml/camlinternalFormat.ml
 lib/ocaml/camlinternalFormat.mli
-${PLIST.ocaml-prof}lib/ocaml/camlinternalFormat.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalFormat.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/camlinternalFormat.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalFormat.p.cmx
 lib/ocaml/camlinternalFormatBasics.cmi
 lib/ocaml/camlinternalFormatBasics.cmt
 lib/ocaml/camlinternalFormatBasics.cmti
 ${PLIST.ocaml-opt}lib/ocaml/camlinternalFormatBasics.cmx
 lib/ocaml/camlinternalFormatBasics.ml
 lib/ocaml/camlinternalFormatBasics.mli
-${PLIST.ocaml-prof}lib/ocaml/camlinternalFormatBasics.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalFormatBasics.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/camlinternalFormatBasics.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalFormatBasics.p.cmx
 lib/ocaml/camlinternalLazy.cmi
 lib/ocaml/camlinternalLazy.cmt
 lib/ocaml/camlinternalLazy.cmti
 ${PLIST.ocaml-opt}lib/ocaml/camlinternalLazy.cmx
 lib/ocaml/camlinternalLazy.ml
 lib/ocaml/camlinternalLazy.mli
-${PLIST.ocaml-prof}lib/ocaml/camlinternalLazy.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalLazy.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/camlinternalLazy.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalLazy.p.cmx
 lib/ocaml/camlinternalMod.cmi
 lib/ocaml/camlinternalMod.cmt
 lib/ocaml/camlinternalMod.cmti
 ${PLIST.ocaml-opt}lib/ocaml/camlinternalMod.cmx
 lib/ocaml/camlinternalMod.ml
 lib/ocaml/camlinternalMod.mli
-${PLIST.ocaml-prof}lib/ocaml/camlinternalMod.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalMod.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/camlinternalMod.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalMod.p.cmx
 lib/ocaml/camlinternalOO.cmi
 lib/ocaml/camlinternalOO.cmt
 lib/ocaml/camlinternalOO.cmti
 ${PLIST.ocaml-opt}lib/ocaml/camlinternalOO.cmx
 lib/ocaml/camlinternalOO.ml
 lib/ocaml/camlinternalOO.mli
-${PLIST.ocaml-prof}lib/ocaml/camlinternalOO.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalOO.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/camlinternalOO.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalOO.p.cmx
 lib/ocaml/char.ml
 lib/ocaml/char.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/CSE.cmi
@@ -258,6 +260,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/augment_specialised_args.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/augment_specialised_args.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/augment_specialised_args.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/augment_specialised_args.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/available_regs.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/available_regs.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/available_regs.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/available_regs.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/available_regs.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_intf.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_intf.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_intf.mli
@@ -334,6 +341,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda_primitives.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda_primitives.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda_primitives.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda_primitives.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda_primitives.mli
 lib/ocaml/compiler-libs/clflags.cmi
 lib/ocaml/compiler-libs/clflags.cmt
 lib/ocaml/compiler-libs/clflags.cmti
@@ -389,6 +401,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.mli
 lib/ocaml/compiler-libs/cmo_format.cmi
 lib/ocaml/compiler-libs/cmo_format.cmti
 lib/ocaml/compiler-libs/cmo_format.mli
@@ -400,6 +417,9 @@ lib/ocaml/compiler-libs/cmt_format.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmx_format.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmx_format.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmx_format.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmxs_format.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmxs_format.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmxs_format.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/coloring.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/coloring.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/coloring.cmti
@@ -410,26 +430,26 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/comballoc.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/comballoc.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/comballoc.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/comballoc.mli
-lib/ocaml/compiler-libs/compdynlink.cmi
-lib/ocaml/compiler-libs/compdynlink.cmt
-lib/ocaml/compiler-libs/compdynlink.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink.cmx
-lib/ocaml/compiler-libs/compdynlink.mli
-lib/ocaml/compiler-libs/compdynlink_common.cmi
-lib/ocaml/compiler-libs/compdynlink_common.cmt
-lib/ocaml/compiler-libs/compdynlink_common.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_common.cmx
-lib/ocaml/compiler-libs/compdynlink_common.mli
-lib/ocaml/compiler-libs/compdynlink_platform_intf.cmi
-lib/ocaml/compiler-libs/compdynlink_platform_intf.cmt
-lib/ocaml/compiler-libs/compdynlink_platform_intf.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_platform_intf.cmx
-lib/ocaml/compiler-libs/compdynlink_platform_intf.mli
-lib/ocaml/compiler-libs/compdynlink_types.cmi
-lib/ocaml/compiler-libs/compdynlink_types.cmt
-lib/ocaml/compiler-libs/compdynlink_types.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_types.cmx
-lib/ocaml/compiler-libs/compdynlink_types.mli
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink.cmi
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink.cmt
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink.cmti
+@comment 4.09 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink.cmx
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink.mli
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_common.cmi
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_common.cmt
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_common.cmti
+@comment 4.09 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_common.cmx
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_common.mli
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_platform_intf.cmi
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_platform_intf.cmt
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_platform_intf.cmti
+@comment 4.09 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_platform_intf.cmx
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_platform_intf.mli
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_types.cmi
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_types.cmt
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_types.cmti
+@comment 4.09 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_types.cmx
+@comment 4.09 lib/ocaml/compiler-libs/compdynlink_types.mli
 lib/ocaml/compiler-libs/compenv.cmi
 lib/ocaml/compiler-libs/compenv.cmt
 lib/ocaml/compiler-libs/compenv.cmti
@@ -460,11 +480,14 @@ lib/ocaml/compiler-libs/compmisc.cmt
 lib/ocaml/compiler-libs/compmisc.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compmisc.cmx
 lib/ocaml/compiler-libs/compmisc.mli
-lib/ocaml/compiler-libs/compplugin.cmi
-lib/ocaml/compiler-libs/compplugin.cmt
-lib/ocaml/compiler-libs/compplugin.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compplugin.cmx
-lib/ocaml/compiler-libs/compplugin.mli
+lib/ocaml/compiler-libs/compute_ranges.cmi
+lib/ocaml/compiler-libs/compute_ranges.cmt
+lib/ocaml/compiler-libs/compute_ranges.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compute_ranges.cmx
+lib/ocaml/compiler-libs/compute_ranges.mli
+lib/ocaml/compiler-libs/compute_ranges_intf.cmi
+lib/ocaml/compiler-libs/compute_ranges_intf.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compute_ranges_intf.cmx
 lib/ocaml/compiler-libs/config.cmi
 lib/ocaml/compiler-libs/config.cmt
 lib/ocaml/compiler-libs/config.cmti
@@ -475,6 +498,11 @@ lib/ocaml/compiler-libs/consistbl.cmt
 lib/ocaml/compiler-libs/consistbl.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/consistbl.cmx
 lib/ocaml/compiler-libs/consistbl.mli
+lib/ocaml/compiler-libs/convert_primitives.cmi
+lib/ocaml/compiler-libs/convert_primitives.cmt
+lib/ocaml/compiler-libs/convert_primitives.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/convert_primitives.cmx
+lib/ocaml/compiler-libs/convert_primitives.mli
 lib/ocaml/compiler-libs/ctype.cmi
 lib/ocaml/compiler-libs/ctype.cmt
 lib/ocaml/compiler-libs/ctype.cmti
@@ -587,6 +615,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_iterators.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_iterators.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_iterators.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_iterators.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_middle_end.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_middle_end.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_middle_end.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_middle_end.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_middle_end.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_to_clambda.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_to_clambda.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_to_clambda.cmti
@@ -811,11 +844,6 @@ lib/ocaml/compiler-libs/meta.cmt
 lib/ocaml/compiler-libs/meta.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/meta.cmx
 lib/ocaml/compiler-libs/meta.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/middle_end.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/middle_end.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/middle_end.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/middle_end.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/middle_end.mli
 lib/ocaml/compiler-libs/misc.cmi
 lib/ocaml/compiler-libs/misc.cmt
 lib/ocaml/compiler-libs/misc.cmti
@@ -848,7 +876,9 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamloptcomp.cmxa
 lib/ocaml/compiler-libs/ocamltoplevel.cma
 lib/ocaml/compiler-libs/opcodes.cmi
 lib/ocaml/compiler-libs/opcodes.cmt
+lib/ocaml/compiler-libs/opcodes.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/opcodes.cmx
+lib/ocaml/compiler-libs/opcodes.mli
 lib/ocaml/compiler-libs/oprint.cmi
 lib/ocaml/compiler-libs/oprint.cmt
 lib/ocaml/compiler-libs/oprint.cmti
@@ -910,6 +940,11 @@ lib/ocaml/compiler-libs/path.cmt
 lib/ocaml/compiler-libs/path.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/path.cmx
 lib/ocaml/compiler-libs/path.mli
+lib/ocaml/compiler-libs/persistent_env.cmi
+lib/ocaml/compiler-libs/persistent_env.cmt
+lib/ocaml/compiler-libs/persistent_env.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/persistent_env.cmx
+lib/ocaml/compiler-libs/persistent_env.mli
 lib/ocaml/compiler-libs/pparse.cmi
 lib/ocaml/compiler-libs/pparse.cmt
 lib/ocaml/compiler-libs/pparse.cmti
@@ -940,6 +975,11 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda_primitives.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda_primitives.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda_primitives.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda_primitives.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda_primitives.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printcmm.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printcmm.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printcmm.cmti
@@ -1010,6 +1050,16 @@ ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg.cmx
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_availability_set.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_availability_set.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_availability_set.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_availability_set.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_availability_set.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_with_debug_info.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_with_debug_info.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_with_debug_info.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_with_debug_info.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg_with_debug_info.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reload.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reload.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reload.cmti
@@ -1183,6 +1233,11 @@ lib/ocaml/compiler-libs/targetint.cmt
 lib/ocaml/compiler-libs/targetint.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/targetint.cmx
 lib/ocaml/compiler-libs/targetint.mli
+lib/ocaml/compiler-libs/tast_iterator.cmi
+lib/ocaml/compiler-libs/tast_iterator.cmt
+lib/ocaml/compiler-libs/tast_iterator.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tast_iterator.cmx
+lib/ocaml/compiler-libs/tast_iterator.mli
 lib/ocaml/compiler-libs/tast_mapper.cmi
 lib/ocaml/compiler-libs/tast_mapper.cmt
 lib/ocaml/compiler-libs/tast_mapper.cmti
@@ -1287,11 +1342,6 @@ lib/ocaml/compiler-libs/typedtree.cmt
 lib/ocaml/compiler-libs/typedtree.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedtree.cmx
 lib/ocaml/compiler-libs/typedtree.mli
-lib/ocaml/compiler-libs/typedtreeIter.cmi
-lib/ocaml/compiler-libs/typedtreeIter.cmt
-lib/ocaml/compiler-libs/typedtreeIter.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedtreeIter.cmx
-lib/ocaml/compiler-libs/typedtreeIter.mli
 lib/ocaml/compiler-libs/typemod.cmi
 lib/ocaml/compiler-libs/typemod.cmt
 lib/ocaml/compiler-libs/typemod.cmti
@@ -1387,6 +1437,7 @@ ${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink.cmx
 ${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink.cmxa
 lib/ocaml/dynlink.mli
 ${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_common.cmx
+${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_compilerlibs.cmx
 ${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_platform_intf.cmx
 ${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_types.cmx
 lib/ocaml/ephemeron.ml
@@ -1423,7 +1474,7 @@ ${PLIST.ocaml-opt}lib/ocaml/libasmrun_pic.a
 ${PLIST.ocaml-opt}lib/ocaml/libasmrun_shared.so
 ${PLIST.ocaml-opt}lib/ocaml/libasmrund.a
 ${PLIST.instrumented_runtime}${PLIST.ocaml-opt}lib/ocaml/libasmruni.a
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/libasmrunp.a
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/libasmrunp.a
 lib/ocaml/libcamlrun.a
 lib/ocaml/libcamlrun_pic.a
 lib/ocaml/libcamlrun_shared.so
@@ -1600,9 +1651,9 @@ lib/ocaml/std_exit.cmt
 ${PLIST.ocaml-opt}lib/ocaml/std_exit.cmx
 lib/ocaml/std_exit.ml
 ${PLIST.ocaml-opt}lib/ocaml/std_exit.o
-${PLIST.ocaml-prof}lib/ocaml/std_exit.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/std_exit.p.cmx
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/std_exit.p.o
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/std_exit.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/std_exit.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/std_exit.p.o
 ${PLIST.ocaml-opt}lib/ocaml/stdlib.a
 lib/ocaml/stdlib.cma
 lib/ocaml/stdlib.cmi
@@ -1612,334 +1663,334 @@ ${PLIST.ocaml-opt}lib/ocaml/stdlib.cmx
 ${PLIST.ocaml-opt}lib/ocaml/stdlib.cmxa
 lib/ocaml/stdlib.ml
 lib/ocaml/stdlib.mli
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.a
-${PLIST.ocaml-prof}lib/ocaml/stdlib.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.cmx
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.cmxa
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.a
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.cmxa
 lib/ocaml/stdlib__arg.cmi
 lib/ocaml/stdlib__arg.cmt
 lib/ocaml/stdlib__arg.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__arg.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__arg.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__arg.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__arg.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__arg.p.cmx
 lib/ocaml/stdlib__array.cmi
 lib/ocaml/stdlib__array.cmt
 lib/ocaml/stdlib__array.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__array.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__array.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__array.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__array.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__array.p.cmx
 lib/ocaml/stdlib__arrayLabels.cmi
 lib/ocaml/stdlib__arrayLabels.cmt
 lib/ocaml/stdlib__arrayLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__arrayLabels.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__arrayLabels.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__arrayLabels.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__arrayLabels.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__arrayLabels.p.cmx
 lib/ocaml/stdlib__bigarray.cmi
 lib/ocaml/stdlib__bigarray.cmt
 lib/ocaml/stdlib__bigarray.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__bigarray.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__bigarray.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bigarray.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__bigarray.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bigarray.p.cmx
 lib/ocaml/stdlib__bool.cmi
 lib/ocaml/stdlib__bool.cmt
 lib/ocaml/stdlib__bool.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__bool.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__bool.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bool.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__bool.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bool.p.cmx
 lib/ocaml/stdlib__buffer.cmi
 lib/ocaml/stdlib__buffer.cmt
 lib/ocaml/stdlib__buffer.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__buffer.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__buffer.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__buffer.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__buffer.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__buffer.p.cmx
 lib/ocaml/stdlib__bytes.cmi
 lib/ocaml/stdlib__bytes.cmt
 lib/ocaml/stdlib__bytes.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__bytes.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__bytes.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bytes.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__bytes.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bytes.p.cmx
 lib/ocaml/stdlib__bytesLabels.cmi
 lib/ocaml/stdlib__bytesLabels.cmt
 lib/ocaml/stdlib__bytesLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__bytesLabels.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__bytesLabels.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bytesLabels.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__bytesLabels.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bytesLabels.p.cmx
 lib/ocaml/stdlib__callback.cmi
 lib/ocaml/stdlib__callback.cmt
 lib/ocaml/stdlib__callback.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__callback.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__callback.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__callback.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__callback.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__callback.p.cmx
 lib/ocaml/stdlib__char.cmi
 lib/ocaml/stdlib__char.cmt
 lib/ocaml/stdlib__char.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__char.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__char.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__char.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__char.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__char.p.cmx
 lib/ocaml/stdlib__complex.cmi
 lib/ocaml/stdlib__complex.cmt
 lib/ocaml/stdlib__complex.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__complex.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__complex.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__complex.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__complex.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__complex.p.cmx
 lib/ocaml/stdlib__digest.cmi
 lib/ocaml/stdlib__digest.cmt
 lib/ocaml/stdlib__digest.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__digest.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__digest.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__digest.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__digest.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__digest.p.cmx
 lib/ocaml/stdlib__ephemeron.cmi
 lib/ocaml/stdlib__ephemeron.cmt
 lib/ocaml/stdlib__ephemeron.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__ephemeron.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__ephemeron.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__ephemeron.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__ephemeron.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__ephemeron.p.cmx
 lib/ocaml/stdlib__filename.cmi
 lib/ocaml/stdlib__filename.cmt
 lib/ocaml/stdlib__filename.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__filename.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__filename.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__filename.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__filename.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__filename.p.cmx
 lib/ocaml/stdlib__float.cmi
 lib/ocaml/stdlib__float.cmt
 lib/ocaml/stdlib__float.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__float.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__float.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__float.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__float.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__float.p.cmx
 lib/ocaml/stdlib__format.cmi
 lib/ocaml/stdlib__format.cmt
 lib/ocaml/stdlib__format.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__format.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__format.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__format.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__format.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__format.p.cmx
 lib/ocaml/stdlib__fun.cmi
 lib/ocaml/stdlib__fun.cmt
 lib/ocaml/stdlib__fun.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__fun.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__fun.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__fun.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__fun.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__fun.p.cmx
 lib/ocaml/stdlib__gc.cmi
 lib/ocaml/stdlib__gc.cmt
 lib/ocaml/stdlib__gc.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__gc.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__gc.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__gc.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__gc.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__gc.p.cmx
 lib/ocaml/stdlib__genlex.cmi
 lib/ocaml/stdlib__genlex.cmt
 lib/ocaml/stdlib__genlex.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__genlex.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__genlex.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__genlex.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__genlex.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__genlex.p.cmx
 lib/ocaml/stdlib__hashtbl.cmi
 lib/ocaml/stdlib__hashtbl.cmt
 lib/ocaml/stdlib__hashtbl.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__hashtbl.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__hashtbl.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__hashtbl.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__hashtbl.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__hashtbl.p.cmx
 lib/ocaml/stdlib__int.cmi
 lib/ocaml/stdlib__int.cmt
 lib/ocaml/stdlib__int.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__int.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__int.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__int.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__int.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__int.p.cmx
 lib/ocaml/stdlib__int32.cmi
 lib/ocaml/stdlib__int32.cmt
 lib/ocaml/stdlib__int32.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__int32.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__int32.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__int32.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__int32.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__int32.p.cmx
 lib/ocaml/stdlib__int64.cmi
 lib/ocaml/stdlib__int64.cmt
 lib/ocaml/stdlib__int64.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__int64.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__int64.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__int64.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__int64.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__int64.p.cmx
 lib/ocaml/stdlib__lazy.cmi
 lib/ocaml/stdlib__lazy.cmt
 lib/ocaml/stdlib__lazy.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__lazy.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__lazy.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__lazy.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__lazy.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__lazy.p.cmx
 lib/ocaml/stdlib__lexing.cmi
 lib/ocaml/stdlib__lexing.cmt
 lib/ocaml/stdlib__lexing.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__lexing.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__lexing.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__lexing.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__lexing.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__lexing.p.cmx
 lib/ocaml/stdlib__list.cmi
 lib/ocaml/stdlib__list.cmt
 lib/ocaml/stdlib__list.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__list.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__list.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__list.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__list.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__list.p.cmx
 lib/ocaml/stdlib__listLabels.cmi
 lib/ocaml/stdlib__listLabels.cmt
 lib/ocaml/stdlib__listLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__listLabels.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__listLabels.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__listLabels.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__listLabels.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__listLabels.p.cmx
 lib/ocaml/stdlib__map.cmi
 lib/ocaml/stdlib__map.cmt
 lib/ocaml/stdlib__map.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__map.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__map.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__map.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__map.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__map.p.cmx
 lib/ocaml/stdlib__marshal.cmi
 lib/ocaml/stdlib__marshal.cmt
 lib/ocaml/stdlib__marshal.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__marshal.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__marshal.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__marshal.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__marshal.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__marshal.p.cmx
 lib/ocaml/stdlib__moreLabels.cmi
 lib/ocaml/stdlib__moreLabels.cmt
 lib/ocaml/stdlib__moreLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__moreLabels.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__moreLabels.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__moreLabels.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__moreLabels.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__moreLabels.p.cmx
 lib/ocaml/stdlib__nativeint.cmi
 lib/ocaml/stdlib__nativeint.cmt
 lib/ocaml/stdlib__nativeint.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__nativeint.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__nativeint.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__nativeint.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__nativeint.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__nativeint.p.cmx
 lib/ocaml/stdlib__obj.cmi
 lib/ocaml/stdlib__obj.cmt
 lib/ocaml/stdlib__obj.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__obj.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__obj.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__obj.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__obj.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__obj.p.cmx
 lib/ocaml/stdlib__oo.cmi
 lib/ocaml/stdlib__oo.cmt
 lib/ocaml/stdlib__oo.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__oo.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__oo.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__oo.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__oo.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__oo.p.cmx
 lib/ocaml/stdlib__option.cmi
 lib/ocaml/stdlib__option.cmt
 lib/ocaml/stdlib__option.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__option.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__option.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__option.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__option.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__option.p.cmx
 lib/ocaml/stdlib__parsing.cmi
 lib/ocaml/stdlib__parsing.cmt
 lib/ocaml/stdlib__parsing.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__parsing.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__parsing.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__parsing.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__parsing.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__parsing.p.cmx
 lib/ocaml/stdlib__pervasives.cmi
 lib/ocaml/stdlib__pervasives.cmt
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__pervasives.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__pervasives.p.cmi
-${PLIST.ocaml-prof}lib/ocaml/stdlib__pervasives.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__pervasives.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__pervasives.p.cmi
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__pervasives.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__pervasives.p.cmx
 lib/ocaml/stdlib__printexc.cmi
 lib/ocaml/stdlib__printexc.cmt
 lib/ocaml/stdlib__printexc.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__printexc.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__printexc.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__printexc.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__printexc.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__printexc.p.cmx
 lib/ocaml/stdlib__printf.cmi
 lib/ocaml/stdlib__printf.cmt
 lib/ocaml/stdlib__printf.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__printf.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__printf.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__printf.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__printf.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__printf.p.cmx
 lib/ocaml/stdlib__queue.cmi
 lib/ocaml/stdlib__queue.cmt
 lib/ocaml/stdlib__queue.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__queue.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__queue.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__queue.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__queue.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__queue.p.cmx
 lib/ocaml/stdlib__random.cmi
 lib/ocaml/stdlib__random.cmt
 lib/ocaml/stdlib__random.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__random.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__random.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__random.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__random.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__random.p.cmx
 lib/ocaml/stdlib__result.cmi
 lib/ocaml/stdlib__result.cmt
 lib/ocaml/stdlib__result.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__result.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__result.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__result.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__result.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__result.p.cmx
 lib/ocaml/stdlib__scanf.cmi
 lib/ocaml/stdlib__scanf.cmt
 lib/ocaml/stdlib__scanf.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__scanf.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__scanf.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__scanf.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__scanf.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__scanf.p.cmx
 lib/ocaml/stdlib__seq.cmi
 lib/ocaml/stdlib__seq.cmt
 lib/ocaml/stdlib__seq.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__seq.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__seq.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__seq.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__seq.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__seq.p.cmx
 lib/ocaml/stdlib__set.cmi
 lib/ocaml/stdlib__set.cmt
 lib/ocaml/stdlib__set.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__set.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__set.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__set.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__set.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__set.p.cmx
 lib/ocaml/stdlib__spacetime.cmi
 lib/ocaml/stdlib__spacetime.cmt
 lib/ocaml/stdlib__spacetime.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__spacetime.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__spacetime.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__spacetime.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__spacetime.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__spacetime.p.cmx
 lib/ocaml/stdlib__stack.cmi
 lib/ocaml/stdlib__stack.cmt
 lib/ocaml/stdlib__stack.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__stack.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__stack.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stack.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__stack.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stack.p.cmx
 lib/ocaml/stdlib__stdLabels.cmi
 lib/ocaml/stdlib__stdLabels.cmt
 lib/ocaml/stdlib__stdLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__stdLabels.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__stdLabels.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stdLabels.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__stdLabels.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stdLabels.p.cmx
 lib/ocaml/stdlib__stream.cmi
 lib/ocaml/stdlib__stream.cmt
 lib/ocaml/stdlib__stream.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__stream.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__stream.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stream.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__stream.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stream.p.cmx
 lib/ocaml/stdlib__string.cmi
 lib/ocaml/stdlib__string.cmt
 lib/ocaml/stdlib__string.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__string.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__string.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__string.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__string.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__string.p.cmx
 lib/ocaml/stdlib__stringLabels.cmi
 lib/ocaml/stdlib__stringLabels.cmt
 lib/ocaml/stdlib__stringLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__stringLabels.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__stringLabels.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stringLabels.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__stringLabels.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stringLabels.p.cmx
 lib/ocaml/stdlib__sys.cmi
 lib/ocaml/stdlib__sys.cmt
 lib/ocaml/stdlib__sys.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__sys.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__sys.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__sys.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__sys.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__sys.p.cmx
 lib/ocaml/stdlib__uchar.cmi
 lib/ocaml/stdlib__uchar.cmt
 lib/ocaml/stdlib__uchar.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__uchar.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__uchar.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__uchar.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__uchar.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__uchar.p.cmx
 lib/ocaml/stdlib__unit.cmi
 lib/ocaml/stdlib__unit.cmt
 lib/ocaml/stdlib__unit.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__unit.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__unit.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__unit.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__unit.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__unit.p.cmx
 lib/ocaml/stdlib__weak.cmi
 lib/ocaml/stdlib__weak.cmt
 lib/ocaml/stdlib__weak.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__weak.cmx
-${PLIST.ocaml-prof}lib/ocaml/stdlib__weak.p.cmt
-${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__weak.p.cmx
+@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__weak.p.cmt
+@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__weak.p.cmx
 ${PLIST.ocaml-opt}lib/ocaml/str.a
 lib/ocaml/str.cma
 lib/ocaml/str.cmi
@@ -1958,11 +2009,9 @@ lib/ocaml/stublibs/dllcamlstr.so
 ${PLIST.ocaml-spacetime}lib/ocaml/stublibs/dllraw_spacetime_lib.so
 lib/ocaml/stublibs/dllthreads.so
 lib/ocaml/stublibs/dllunix.so
-lib/ocaml/stublibs/dllvmthreads.so
+@comment 4.09 lib/ocaml/stublibs/dllvmthreads.so
 lib/ocaml/sys.ml
 lib/ocaml/sys.mli
-lib/ocaml/target_camlheaderd
-${PLIST.instrumented_runtime}lib/ocaml/target_camlheaderi
 lib/ocaml/threads/condition.cmi
 lib/ocaml/threads/condition.cmti
 ${PLIST.ocaml-opt}lib/ocaml/threads/condition.cmx
@@ -2006,25 +2055,6 @@ lib/ocaml/unixLabels.cmi
 lib/ocaml/unixLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/unixLabels.cmx
 lib/ocaml/unixLabels.mli
-lib/ocaml/vmthreads/condition.cmi
-lib/ocaml/vmthreads/condition.cmti
-lib/ocaml/vmthreads/condition.mli
-lib/ocaml/vmthreads/event.cmi
-lib/ocaml/vmthreads/event.cmti
-lib/ocaml/vmthreads/event.mli
-lib/ocaml/vmthreads/libvmthreads.a
-lib/ocaml/vmthreads/mutex.cmi
-lib/ocaml/vmthreads/mutex.cmti
-lib/ocaml/vmthreads/mutex.mli
-lib/ocaml/vmthreads/stdlib.cma
-lib/ocaml/vmthreads/thread.cmi
-lib/ocaml/vmthreads/thread.cmti
-lib/ocaml/vmthreads/thread.mli
-lib/ocaml/vmthreads/threadUnix.cmi
-lib/ocaml/vmthreads/threadUnix.cmti
-lib/ocaml/vmthreads/threadUnix.mli
-lib/ocaml/vmthreads/threads.cma
-lib/ocaml/vmthreads/unix.cma
 lib/ocaml/weak.ml
 lib/ocaml/weak.mli
 man/man1/ocaml.1
@@ -2144,6 +2174,7 @@ man/man3/Complex.3
 man/man3/Condition.3
 man/man3/Config.3
 man/man3/Consistbl.3
+man/man3/Consistbl.Make.3
 man/man3/Depend.3
 man/man3/Depend.String.3
 man/man3/Digest.3
@@ -2173,8 +2204,6 @@ man/man3/Format.3
 man/man3/Fun.3
 man/man3/Gc.3
 man/man3/Genlex.3
-man/man3/Graphics.3
-man/man3/GraphicsX11.3
 man/man3/Hashtbl.3
 man/man3/Hashtbl.HashedType.3
 man/man3/Hashtbl.Make.3
@@ -2200,6 +2229,7 @@ man/man3/Identifiable.Thing.3
 man/man3/Int.3
 man/man3/Int32.3
 man/man3/Int64.3
+man/man3/Int_replace_polymorphic_compare.3
 man/man3/Lazy.3
 man/man3/Lexer.3
 man/man3/Lexing.3
@@ -2216,11 +2246,10 @@ man/man3/Map.S.3
 man/man3/Marshal.3
 man/man3/Misc.3
 man/man3/Misc.Color.3
+man/man3/Misc.EnvLazy.3
 man/man3/Misc.Error_style.3
-man/man3/Misc.HookSig.3
 man/man3/Misc.Int_literal_converter.3
 man/man3/Misc.LongString.3
-man/man3/Misc.MakeHooks.3
 man/man3/Misc.Stdlib.3
 man/man3/Misc.Stdlib.Array.3
 man/man3/Misc.Stdlib.List.3
@@ -2267,8 +2296,6 @@ man/man3/Parsing.3
 man/man3/Pervasives.3
 man/man3/Pervasives.LargeFile.3
 man/man3/Pparse.3
-man/man3/Pparse.ImplementationHooks.3
-man/man3/Pparse.InterfaceHooks.3
 man/man3/Pprintast.3
 man/man3/Printast.3
 man/man3/Printexc.3
@@ -2286,8 +2313,6 @@ man/man3/Set.3
 man/man3/Set.Make.3
 man/man3/Set.OrderedType.3
 man/man3/Set.S.3
-man/man3/Simplif.3
-man/man3/Simplif.Hooks.3
 man/man3/Spacetime.3
 man/man3/Spacetime.Series.3
 man/man3/Spacetime.Snapshot.3
@@ -2367,11 +2392,6 @@ man/man3/Targetint.3
 man/man3/Terminfo.3
 man/man3/Thread.3
 man/man3/ThreadUnix.3
-man/man3/Typemod.3
-man/man3/Typemod.ImplementationHooks.3
-man/man3/Typemod.InterfaceHooks.3
-man/man3/Typemod.Sig_component_kind.3
-man/man3/Typemod.Signature_names.3
 man/man3/Uchar.3
 man/man3/Unit.3
 man/man3/Unix.3
diff --git a/ocaml/distinfo b/ocaml/distinfo
index 984ec78e95..56647d7a09 100644
--- a/ocaml/distinfo
+++ b/ocaml/distinfo
@@ -1,32 +1,21 @@
 $NetBSD: distinfo,v 1.125 2019/01/07 18:52:23 jaapb Exp $
 
-SHA1 (ocaml-4.08.1+rc1.tar.gz) = fbd1cf83a195ca88e97ece28468b4a694776c5b9
-RMD160 (ocaml-4.08.1+rc1.tar.gz) = 2fbe4ae5b233b6a93ea70aa1621ac54c02c09f72
-SHA512 (ocaml-4.08.1+rc1.tar.gz) = b67e6ffa74815af4538283e65ec86dbb6fae6968b1963048c717adf15d569512cd27b1603a889f8292099bc80e7c4a77762a7745df11efe6c7c88347be9c3a5c
-Size (ocaml-4.08.1+rc1.tar.gz) = 4897698 bytes
+SHA1 (ocaml-4.09.0+beta2.tar.gz) = 042e5f48810fe1c7da268b1fde3c0110da249d2f
+RMD160 (ocaml-4.09.0+beta2.tar.gz) = 99d7d162656b6d061fa6dc4d24eff61c5785cae6
+SHA512 (ocaml-4.09.0+beta2.tar.gz) = b9fc5207f1ce1e436292eb72d00821770b5be020992d591ad1fe29855fc6f668b7f308275f6b9d1aa837b634154f625d774420424833435375217e53e6ad9dfa
+Size (ocaml-4.09.0+beta2.tar.gz) = 4831734 bytes
 SHA1 (patch-Makefile) = 5540fa654349931a9796d97ad71ecdff90a60e91
 SHA1 (patch-Makefile.common.in) = 419b838a31898fffdbe5dc785ee7c602b48343ca
 SHA1 (patch-asmcomp_amd64_emit.mlp) = 68cc42afd6439347524f2d81c48305dcbc173869
-SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
 SHA1 (patch-asmrun_amd64.S) = c7cd60d9b02ddc3b9a09c696f697d5f78c25a13f
-SHA1 (patch-configure) = 29772545e35625fb8b8d74ca74291d62eee1b1c6
-SHA1 (patch-driver_compenv.ml) = fce94a3c0d7681598d9dfe7d5e882e3ad5a15540
-SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991
-SHA1 (patch-driver_main_args.ml) = 4c6a6ec25f433974f9aab99b4f2ac9c884bb3b04
-SHA1 (patch-driver_main_args.mli) = 5e8164e4392c0dde6c6264eeed87c346128e1863
-SHA1 (patch-driver_optmain.ml) = 5ce77f1f906ce59cb533b4d25e4d57f7a70ab1b3
-SHA1 (patch-lex_Makefile) = 5280f98078e8065e590a94d520d7a47763b9442e
+SHA1 (patch-configure) = 3111a942827cd54695fefe2ce4c0925a62cf5c04
+SHA1 (patch-lex_Makefile) = 213c15b1d79fcf75caa8ae221565c9428d8ff9e0
 SHA1 (patch-man_Makefile) = b780c026aef5f7e6b22b142fce3ec87ef9d2ab22
 SHA1 (patch-ocamldoc_Makefile) = 5605f29b3076c822dc8850542d00511111c29f22
 SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b
 SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 9933ed1b10c79885920020c444750f7487829d6b
 SHA1 (patch-otherlibs_systhreads_Makefile) = 477f965a6d8854dcf33caecb91d6655896333950
-SHA1 (patch-otherlibs_threads_Makefile) = 607e5ae77c526ea412452b93454d2e0d65aed687
 SHA1 (patch-runtime_Makefile) = 45c05f2276c67fb77ef19738e7be5ecc4ceb7558
-SHA1 (patch-tools_Makefile) = 8685b49a46b6a9337b621e94699dca43c6ba291a
-SHA1 (patch-tools_ocamlcp.ml) = 76dfe040e6d61f0c844e01fa2bd9b6b0f1c21b99
+SHA1 (patch-tools_Makefile) = e42e5009051d86ed514b08c016b83a865a5ec773
 SHA1 (patch-tools_ocamlmklib) = 409e9fab682d9c0533725b872fd233becf234133
-SHA1 (patch-tools_ocamloptp.ml) = 070bd797fcd4120e58d15a09f25d93ec46b87d1a
-SHA1 (patch-utils_clflags.ml) = 1c8223caac3c81b134b470d9bb2fb5ce62576c53
-SHA1 (patch-utils_clflags.mli) = 381951d9583e032d3a520b68a8fe9f867ec49995
 SHA1 (patch-yacc_Makefile) = 938c492aaaeb970d6c3b7ebf61b8241808ecf7a5
diff --git a/ocaml/patches/patch-asmcomp_asmlink.ml b/ocaml/patches/patch-asmcomp_asmlink.ml
deleted file mode 100644
index a7057040a3..0000000000
--- a/ocaml/patches/patch-asmcomp_asmlink.ml
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-asmcomp_asmlink.ml,v 1.2 2015/12/29 23:34:52 dholland Exp $
-
-pkgsrc_runtime flag
-
---- asmcomp/asmlink.ml.orig	2014-05-21 15:08:11.000000000 +0000
-+++ asmcomp/asmlink.ml
-@@ -98,6 +98,13 @@ let add_ccobjs l =
-   end
- 
- let runtime_lib () =
-+	if !Clflags.pkgsrc_runtime
-+	then begin
-+		if !Clflags.gprofile
-+		then [ "-lasmrunp" ]
-+		else [ "-lasmrun" ^ !Clflags.runtime_variant ]
-+	end
-+	else
-   let libname =
-     if !Clflags.gprofile
-     then "libasmrunp" ^ ext_lib
diff --git a/ocaml/patches/patch-configure b/ocaml/patches/patch-configure
index 32b1bf740b..8a667e5ab7 100644
--- a/ocaml/patches/patch-configure
+++ b/ocaml/patches/patch-configure
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- configure.orig	2019-03-01 15:13:45.000000000 +0000
+--- configure.orig	2019-09-11 14:40:30.000000000 +0000
 +++ configure
-@@ -13379,7 +13379,7 @@ sharedlib_cflags=''
+@@ -13281,7 +13281,7 @@ sharedlib_cflags=''
  mksharedlib='shared-libs-not-available'
  rpath=''
  mksharedlibrpath=''
@@ -11,25 +11,25 @@ $NetBSD$
  
  if test x"$enable_shared" != "xno"; then :
    case $host in #(
-@@ -13475,6 +13475,8 @@ fi ;; #(
+@@ -13383,6 +13383,8 @@ if test x"$enable_shared" != "xno"; then
      natdynlink=true ;; #(
-   aarch64-*-linux*) :
+   aarch64-*-freebsd*) :
      natdynlink=true ;; #(
 +  aarch64-*-netbsd*) :
 +    natdynlink=true ;; #(
    *) :
       ;;
  esac
-@@ -13526,6 +13528,8 @@ case $host in #(
+@@ -13434,6 +13436,8 @@ case $host in #(
      arch=i386; system=beos ;; #(
    i[3456]86-*-cygwin) :
      arch=i386; system=cygwin ;; #(
-+	i[3456]86-*-interix3) :
-+		arch=i386; system=interix3 ;; #(
-   i[3456]86-*-darwin*) :
-     if $arch64; then :
-   arch=amd64
-@@ -13570,6 +13574,10 @@ fi; system=elf ;; #(
++  i[3456]86-*-interix3) :
++    arch=i386; system=interix3 ;; #(
+   i[3456]86-*-gnu*) :
+     arch=i386; system=gnu ;; #(
+   i[3456]86-*-mingw32) :
+@@ -13468,6 +13472,10 @@ fi; system=elf ;; #(
      arch=arm; model=armv6; system=linux_eabi ;; #(
    armv6*-*-freebsd*) :
      arch=arm; model=armv6; system=freebsd ;; #(
@@ -40,16 +40,16 @@ $NetBSD$
    earmv6*-*-netbsd*) :
      arch=arm; model=armv6; system=netbsd ;; #(
    earmv7*-*-netbsd*) :
-@@ -13602,6 +13610,8 @@ fi; system=elf ;; #(
-     arch=amd64; system=mingw64 ;; #(
-   aarch64-*-linux*) :
+@@ -13504,6 +13512,8 @@ fi; system=elf ;; #(
      arch=arm64; system=linux ;; #(
+   aarch64-*-freebsd*) :
+     arch=arm64; system=freebsd ;; #(
 +  aarch64-*-netbsd*) :
 +    arch=arm64; system=netbsd ;; #(
    x86_64-*-cygwin*) :
      arch=amd64; system=cygwin
   ;; #(
-@@ -13932,7 +13942,7 @@ fi
+@@ -13788,7 +13798,7 @@ fi
  # for the moment, to be backward-compatible
  
  case $host in #(
diff --git a/ocaml/patches/patch-driver_compenv.ml b/ocaml/patches/patch-driver_compenv.ml
deleted file mode 100644
index 546b71abe0..0000000000
--- a/ocaml/patches/patch-driver_compenv.ml
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- driver/compenv.ml.orig	2019-02-08 14:34:09.000000000 +0000
-+++ driver/compenv.ml
-@@ -235,6 +235,7 @@ let read_one_param ppf position name v =
- 
-   | "pp" -> preprocessor := Some v
-   | "runtime-variant" -> runtime_variant := v
-+  | "pkgsrc-runtime" -> set "pkgsrc-runtime" [ pkgsrc_runtime ] v
-   | "open" ->
-       open_modules := List.rev_append (String.split_on_char ',' v) !open_modules
-   | "cc" -> c_compiler := Some v
diff --git a/ocaml/patches/patch-driver_main.ml b/ocaml/patches/patch-driver_main.ml
deleted file mode 100644
index be696b737b..0000000000
--- a/ocaml/patches/patch-driver_main.ml
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-driver_main.ml,v 1.3 2016/05/05 08:12:01 jaapb Exp $
-
-pkgsrc_runtime flag
-
---- driver/main.ml.orig	2016-04-25 13:36:01.000000000 +0000
-+++ driver/main.ml
-@@ -129,6 +129,7 @@ module Options = Main_args.Make_bytecomp
-   let _rectypes = set recursive_types
-   let _no_rectypes = unset recursive_types
-   let _runtime_variant s = runtime_variant := s
-+  let _pkgsrc_runtime = set pkgsrc_runtime
-   let _safe_string = unset unsafe_string
-   let _short_paths = unset real_paths
-   let _strict_sequence = set strict_sequence
diff --git a/ocaml/patches/patch-driver_main_args.ml b/ocaml/patches/patch-driver_main_args.ml
deleted file mode 100644
index 2302997ddb..0000000000
--- a/ocaml/patches/patch-driver_main_args.ml
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-driver_main_args.ml,v 1.5 2016/12/30 11:15:00 jaapb Exp $
-
-pkgsrc_runtime flag
-
---- driver/main_args.ml.orig	2016-09-05 13:19:52.000000000 +0000
-+++ driver/main_args.ml
-@@ -376,6 +376,10 @@ let mk_pack_opt f =
-   "-pack", Arg.Unit f, " Package the given .cmx files into one .cmx"
- ;;
- 
-+let mk_pkgsrc_runtime f =
-+  "-pkgsrc-runtime", Arg.Unit f, " Use pkgsrc linking for runtime"
-+;;
-+
- let mk_pp f =
-   "-pp", Arg.String f, "<command>  Pipe sources through preprocessor <command>"
- ;;
-@@ -797,6 +801,7 @@ module type Compiler_options = sig
-   val _output_obj : unit -> unit
-   val _output_complete_obj : unit -> unit
-   val _pack : unit -> unit
-+	val _pkgsrc_runtime : unit -> unit
-   val _plugin : string -> unit
-   val _pp : string -> unit
-   val _principal : unit -> unit
-@@ -988,6 +993,7 @@ struct
-     mk_output_obj F._output_obj;
-     mk_output_complete_obj F._output_complete_obj;
-     mk_pack_byt F._pack;
-+		mk_pkgsrc_runtime F._pkgsrc_runtime;
-     mk_pp F._pp;
-     mk_ppx F._ppx;
-     mk_plugin F._plugin;
-@@ -1148,6 +1154,7 @@ struct
-     mk_output_complete_obj F._output_complete_obj;
-     mk_p F._p;
-     mk_pack_opt F._pack;
-+		mk_pkgsrc_runtime F._pkgsrc_runtime;
-     mk_plugin F._plugin;
-     mk_pp F._pp;
-     mk_ppx F._ppx;
diff --git a/ocaml/patches/patch-driver_main_args.mli b/ocaml/patches/patch-driver_main_args.mli
deleted file mode 100644
index 77ca3defda..0000000000
--- a/ocaml/patches/patch-driver_main_args.mli
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-driver_main_args.mli,v 1.5 2016/12/30 11:15:00 jaapb Exp $
-
-pkgsrc_runtime flag
-
---- driver/main_args.mli.orig	2016-09-05 13:19:52.000000000 +0000
-+++ driver/main_args.mli
-@@ -84,6 +84,7 @@ module type Compiler_options = sig
-   val _output_obj : unit -> unit
-   val _output_complete_obj : unit -> unit
-   val _pack : unit -> unit
-+  val _pkgsrc_runtime : unit -> unit
-   val _plugin : string -> unit
-   val _pp : string -> unit
-   val _principal : unit -> unit
diff --git a/ocaml/patches/patch-driver_optmain.ml b/ocaml/patches/patch-driver_optmain.ml
deleted file mode 100644
index ba3960abb1..0000000000
--- a/ocaml/patches/patch-driver_optmain.ml
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-driver_optmain.ml,v 1.3 2016/05/05 08:12:01 jaapb Exp $
-
-pkgsrc_runtime flag
-
---- driver/optmain.ml.orig	2016-04-25 13:36:01.000000000 +0000
-+++ driver/optmain.ml
-@@ -203,6 +203,7 @@ module Options = Main_args.Make_optcomp_
-   let _no_rectypes = clear recursive_types
-   let _remove_unused_arguments = set remove_unused_arguments
-   let _runtime_variant s = runtime_variant := s
-+  let _pkgsrc_runtime = set pkgsrc_runtime
-   let _safe_string = clear unsafe_string
-   let _short_paths = clear real_paths
-   let _strict_sequence = set strict_sequence
diff --git a/ocaml/patches/patch-lex_Makefile b/ocaml/patches/patch-lex_Makefile
index d205ef9b52..8f5073bb4d 100644
--- a/ocaml/patches/patch-lex_Makefile
+++ b/ocaml/patches/patch-lex_Makefile
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- lex/Makefile.orig	2019-03-01 15:13:45.000000000 +0000
+--- lex/Makefile.orig	2019-09-11 14:40:30.000000000 +0000
 +++ lex/Makefile
-@@ -28,7 +28,7 @@ CAMLC = $(CAMLRUN) $(ROOTDIR)/boot/ocaml
+@@ -27,7 +27,7 @@ CAMLC = $(BOOT_OCAMLC) -strict-sequence 
  CAMLOPT = $(CAMLRUN) $(ROOTDIR)/ocamlopt -nostdlib -I $(ROOTDIR)/stdlib
  COMPFLAGS = $(INCLUDES) -absname -w +a-4-9-41-42-44-45-48 -warn-error A \
              -safe-string -strict-sequence -strict-formats -bin-annot
@@ -10,8 +10,8 @@ $NetBSD$
 +LINKFLAGS = -cclib "$(LDFLAGS)"
  YACCFLAGS = -v
  CAMLLEX = $(CAMLRUN) $(ROOTDIR)/boot/ocamllex
- CAMLDEP = $(CAMLRUN) $(ROOTDIR)/boot/ocamlc -depend
-@@ -47,7 +47,7 @@ ocamllex: $(OBJS)
+ CAMLDEP = $(BOOT_OCAMLC) -depend
+@@ -46,7 +46,7 @@ ocamllex: $(OBJS)
  	$(CAMLC) $(LINKFLAGS) -compat-32 -o ocamllex $(OBJS)
  
  ocamllex.opt: $(OBJS:.cmo=.cmx)
diff --git a/ocaml/patches/patch-otherlibs_threads_Makefile b/ocaml/patches/patch-otherlibs_threads_Makefile
deleted file mode 100644
index 6f95282159..0000000000
--- a/ocaml/patches/patch-otherlibs_threads_Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
---- otherlibs/threads/Makefile.orig	2019-02-08 14:34:10.000000000 +0000
-+++ otherlibs/threads/Makefile
-@@ -28,6 +28,7 @@ CAMLC=$(CAMLRUN) $(ROOTDIR)/ocamlc -nost
-       -I $(ROOTDIR)/stdlib -I $(ROOTDIR)/otherlibs/unix
- MKLIB=$(CAMLRUN) $(ROOTDIR)/tools/ocamlmklib
- COMPFLAGS=-w +33..39 -warn-error A -bin-annot -g -safe-string
-+LDOPTS=	-ldopt $(LDFLAGS)
- 
- C_OBJS=scheduler.o
- 
-@@ -68,7 +69,7 @@ all: libvmthreads.a threads.cma stdlib.c
- allopt:
- 
- libvmthreads.a: $(C_OBJS)
--	$(MKLIB) -o threads -oc vmthreads $(C_OBJS)
-+	$(MKLIB) -o threads -oc vmthreads $(C_OBJS) $(LDOPTS)
- 
- threads.cma: $(CAML_OBJS)
- 	$(MKLIB) -ocamlc '$(CAMLC)' -o threads -oc vmthreads $^
-@@ -121,7 +122,7 @@ install:
- 	if test -f dllvmthreads.so; then \
- 	  $(INSTALL_PROG) dllvmthreads.so "$(INSTALL_STUBLIBDIR)"; \
- 	fi
--	mkdir -p "$(INSTALL_LIBDIR)/vmthreads"
-+	$(BSD_INSTALL_LIB_DIR) -p "$(INSTALL_LIBDIR)/vmthreads"
- 	$(INSTALL_DATA) libvmthreads.a "$(INSTALL_LIBDIR)/vmthreads"
- 	cd "$(INSTALL_LIBDIR)/vmthreads"; $(RANLIB) libvmthreads.a
- 	$(INSTALL_DATA) \
diff --git a/ocaml/patches/patch-tools_Makefile b/ocaml/patches/patch-tools_Makefile
index a72d2084fc..d56fda81b3 100644
--- a/ocaml/patches/patch-tools_Makefile
+++ b/ocaml/patches/patch-tools_Makefile
@@ -1,9 +1,9 @@
 $NetBSD$
 
---- tools/Makefile.orig	2019-03-01 15:13:46.000000000 +0000
+--- tools/Makefile.orig	2019-09-11 14:40:30.000000000 +0000
 +++ tools/Makefile
-@@ -81,7 +81,7 @@ INCLUDES = $(addprefix -I $(ROOTDIR)/,ut
-                        middle_end middle_end/base_types driver toplevel)
+@@ -82,7 +82,7 @@ INCLUDES = $(addprefix -I $(ROOTDIR)/,ut
+                        file_formats lambda)
  COMPFLAGS = -absname -w +a-4-9-41-42-44-45-48 -strict-sequence -warn-error A \
   -safe-string -strict-formats -bin-annot $(INCLUDES)
 -LINKFLAGS = $(INCLUDES)
diff --git a/ocaml/patches/patch-tools_ocamlcp.ml b/ocaml/patches/patch-tools_ocamlcp.ml
deleted file mode 100644
index fc3a15dcba..0000000000
--- a/ocaml/patches/patch-tools_ocamlcp.ml
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-tools_ocamlcp.ml,v 1.5 2017/10/17 08:26:05 wiz Exp $
-
-pkgsrc_runtime flag
-
---- tools/ocamlcp.ml.orig	2016-09-05 13:19:52.000000000 +0000
-+++ tools/ocamlcp.ml
-@@ -86,6 +86,7 @@ module Options = Main_args.Make_bytecomp
-   let _output_obj = option "-output-obj"
-   let _output_complete_obj = option "-output-complete-obj"
-   let _pack = option "-pack"
-+  let _pkgsrc_runtime = option "-pkgsrc-runtime"
-   let _plugin = option_with_arg "-plugin"
-   let _pp _s = incompatible "-pp"
-   let _ppx _s = incompatible "-ppx"
diff --git a/ocaml/patches/patch-tools_ocamloptp.ml b/ocaml/patches/patch-tools_ocamloptp.ml
deleted file mode 100644
index 65664c787e..0000000000
--- a/ocaml/patches/patch-tools_ocamloptp.ml
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-tools_ocamloptp.ml,v 1.5 2017/10/17 08:26:05 wiz Exp $
-
-pkgsrc_runtime flag
-
---- tools/ocamloptp.ml.orig	2016-09-05 13:19:52.000000000 +0000
-+++ tools/ocamloptp.ml
-@@ -108,6 +108,7 @@ module Options = Main_args.Make_optcomp_
-   let _output_complete_obj = option "-output-complete-obj"
-   let _p = option "-p"
-   let _pack = option "-pack"
-+  let _pkgsrc_runtime = option "-pkgsrc-runtime"
-   let _plugin = option_with_arg "-plugin"
-   let _pp _s = incompatible "-pp"
-   let _ppx _s = incompatible "-ppx"
diff --git a/ocaml/patches/patch-utils_clflags.ml b/ocaml/patches/patch-utils_clflags.ml
deleted file mode 100644
index bcf51c628a..0000000000
--- a/ocaml/patches/patch-utils_clflags.ml
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-utils_clflags.ml,v 1.5 2018/01/10 14:30:35 jaapb Exp $
-
-pkgsrc_runtime flag
-
---- utils/clflags.ml.orig	2017-10-03 08:35:25.000000000 +0000
-+++ utils/clflags.ml
-@@ -154,7 +154,8 @@ let pic_code = ref (match Config.archite
-                      | "amd64" -> true
-                      | _       -> false)
- 
--let runtime_variant = ref "";;      (* -runtime-variant *)
-+let runtime_variant = ref ""           (* -runtime-variant *)
-+let pkgsrc_runtime = ref false;;       (* -pkgsrc-runtime *)
- 
- let keep_docs = ref false              (* -keep-docs *)
- let keep_locs = ref true               (* -keep-locs *)
diff --git a/ocaml/patches/patch-utils_clflags.mli b/ocaml/patches/patch-utils_clflags.mli
deleted file mode 100644
index 167c3f6400..0000000000
--- a/ocaml/patches/patch-utils_clflags.mli
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-utils_clflags.mli,v 1.4 2016/05/05 08:12:01 jaapb Exp $
-
-pkgsrc_runtime flag
-
---- utils/clflags.mli.orig	2016-04-01 12:53:41.000000000 +0000
-+++ utils/clflags.mli
-@@ -174,6 +174,7 @@ val shared : bool ref
- val dlcode : bool ref
- val pic_code : bool ref
- val runtime_variant : string ref
-+val pkgsrc_runtime : bool ref
- val force_slash : bool ref
- val keep_docs : bool ref
- val keep_locs : bool ref


Home | Main Index | Thread Index | Old Index