pkgsrc-WIP-changes archive

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

ocaml: update to 5.2.0



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Jun 17 17:36:41 2024 +0200
Changeset:	078f386cb27688744535c8f5b12d1819515d00a6

Modified Files:
	ocaml/Makefile
	ocaml/Makefile.common
	ocaml/PLIST
	ocaml/buildlink3.mk
	ocaml/distinfo
	ocaml/hacks.mk
	ocaml/native.mk
	ocaml/ocaml.mk
	ocaml/options.mk
Removed Files:
	ocaml/patches/patch-Makefile
	ocaml/patches/patch-Makefile.build_config.in
	ocaml/patches/patch-api__docgen_ocamldoc_Makefile
	ocaml/patches/patch-check-linker-version_sh
	ocaml/patches/patch-configure
	ocaml/patches/patch-lex_Makefile
	ocaml/patches/patch-man_Makefile
	ocaml/patches/patch-ocamldoc_Makefile
	ocaml/patches/patch-ocamldoc_odoc__messages.ml
	ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
	ocaml/patches/patch-otherlibs_systhreads_Makefile
	ocaml/patches/patch-otherlibs_systhreads_st__stubs.c
	ocaml/patches/patch-otherlibs_unix_Makefile
	ocaml/patches/patch-runtime_floats.c
	ocaml/patches/patch-runtime_sak.c
	ocaml/patches/patch-testsuite_tests_lib-systhreads_testyield.ml
	ocaml/patches/patch-tools_Makefile
	ocaml/patches/patch-tools_ocamlmklib.ml

Log Message:
ocaml: update to 5.2.0

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

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

diffstat:
 ocaml/Makefile                                     |   21 +-
 ocaml/Makefile.common                              |   13 +-
 ocaml/PLIST                                        | 1507 +++++++++++---------
 ocaml/buildlink3.mk                                |    4 +-
 ocaml/distinfo                                     |   26 +-
 ocaml/hacks.mk                                     |    4 +-
 ocaml/native.mk                                    |    4 +-
 ocaml/ocaml.mk                                     |   20 +-
 ocaml/options.mk                                   |   31 +-
 ocaml/patches/patch-Makefile                       |   62 -
 ocaml/patches/patch-Makefile.build_config.in       |   19 -
 ocaml/patches/patch-api__docgen_ocamldoc_Makefile  |   38 -
 ocaml/patches/patch-check-linker-version_sh        |   19 -
 ocaml/patches/patch-configure                      |  183 ---
 ocaml/patches/patch-lex_Makefile                   |   13 -
 ocaml/patches/patch-man_Makefile                   |   14 -
 ocaml/patches/patch-ocamldoc_Makefile              |   13 -
 ocaml/patches/patch-ocamldoc_odoc__messages.ml     |   15 -
 .../patch-otherlibs_Makefile.otherlibs.common      |   13 -
 ocaml/patches/patch-otherlibs_systhreads_Makefile  |   13 -
 .../patches/patch-otherlibs_systhreads_st__stubs.c |   14 -
 ocaml/patches/patch-otherlibs_unix_Makefile        |   13 -
 ocaml/patches/patch-runtime_floats.c               |   21 -
 ocaml/patches/patch-runtime_sak.c                  |   15 -
 ...tch-testsuite_tests_lib-systhreads_testyield.ml |   18 -
 ocaml/patches/patch-tools_Makefile                 |   13 -
 ocaml/patches/patch-tools_ocamlmklib.ml            |   50 -
 27 files changed, 883 insertions(+), 1293 deletions(-)

diffs:
diff --git a/ocaml/Makefile b/ocaml/Makefile
index 289acf132f..d9addb147a 100644
--- a/ocaml/Makefile
+++ b/ocaml/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.147 2022/10/23 13:09:30 he Exp $
+# $NetBSD: Makefile,v 1.148 2023/04/09 07:28:27 wiz Exp $
 
 .include "Makefile.common"
 
 TEST_PROGRAM=		ocamltest
-MAKE_JOBS_SAFE=		no
+#MAKE_JOBS_SAFE=	no
 UNLIMIT_RESOURCES=	stacksize
 
 USE_TOOLS+=		bash
@@ -11,13 +11,9 @@ USE_LANGUAGES+=		c
 USE_LIBTOOL=		yes
 USE_GNU_CONFIGURE_HOST=	no
 
-#USE_GCC_RUNTIME=	yes
-
 .include "options.mk"
 .include "native.mk"
 
-# Options
-
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
 CONFIGURE_ARGS+=	--enable-native-compiler
 BUILD_TARGET=		world.opt
@@ -27,11 +23,11 @@ BUILD_TARGET=		world
 .endif
 
 # configure: error: fma does not work, enable emulation with --enable-imprecise-c99-float-ops
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
-    !empty(MACHINE_PLATFORM:MNetBSD-*-earm*)
+.if ${MACHINE_PLATFORM:MNetBSD-*-i386} || \
+    ${MACHINE_PLATFORM:MNetBSD-*-earm*}
 CONFIGURE_ARGS+=	--enable-imprecise-c99-float-ops
 .endif
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) && (${OPSYS_VERSION} < 99999)
+.if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} && (${OPSYS_VERSION} < 99999)
 # fma(3) was added for powerpc between 9.99.98 and 9.99.99
 CONFIGURE_ARGS+=	--enable-imprecise-c99-float-ops
 .endif
@@ -54,6 +50,9 @@ EXTRA_RT_LIBS.NetBSD=	-lcurses
 EXTRA_RT_LIBS.*=
 
 PRINT_PLIST_AWK+=	{ gsub(/lib\/ocaml\/${PKGMANDIR:S|/|\\/|}/, "lib/ocaml/$${PKGMANDIR}"); }
+PRINT_PLIST_AWK+=	{ if (/\.opt$$/) $$0 = "$${PLIST.ocaml-opt}" $$0 }
+PRINT_PLIST_AWK+=	{ if (/\.cmx$$/) $$0 = "$${PLIST.ocaml-opt}" $$0 }
+PRINT_PLIST_AWK+=	{ if (/^bin\/ocamlopt/) $$0 = "$${PLIST.ocaml-opt}" $$0 }
 
 do-test:
 	cd ${WRKSRC} && ${MAKE_PROGRAM} ${TEST_PROGRAM}
@@ -68,6 +67,10 @@ fix-darwin-install-name:
 		install_name_tool -id `${ECHO} $$f | ${SED} -e 's,${DESTDIR},,g'` $$f; \
 	done
 .endif
+.PHONY: fix-man-extension
+post-install: fix-man-extension
+fix-man-extension:
+	cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3 && for i in *.3o; do mv $$i $${i%%o}; done
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
diff --git a/ocaml/Makefile.common b/ocaml/Makefile.common
index c66ef14037..eaf7f1eb63 100644
--- a/ocaml/Makefile.common
+++ b/ocaml/Makefile.common
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.64 2022/05/24 18:25:38 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.65 2023/04/09 07:27:48 wiz Exp $
 
 # used by x11/labltk/Makefile
-DISTNAME=	ocaml-5.0.0~beta1
+DISTNAME=	ocaml-5.2.0
 CATEGORIES=	lang
-MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-5.0/
-#EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	https://caml.inria.fr/pub/distrib/ocaml-5.2/
 
 MAINTAINER=	jaapb%NetBSD.org@localhost
 HOMEPAGE=	https://ocaml.org/
@@ -14,6 +13,11 @@ LICENSE=	gnu-gpl-v2
 USE_LANGUAGES+=		c99
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
+
+MAKE_FLAGS+=		INSTALL=${INSTALL:Q}
+MAKE_FLAGS+=		INSTALL_DATA=${INSTALL_DATA:Q}
+MAKE_FLAGS+=		INSTALL_PROG=${INSTALL_SCRIPT:Q}
+
 #CONFIGURE_ENV+=	BDB_LIBS=${BDB_LINK:Q}
 #CONFIGURE_ENV+=	BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}:Q}
 #CONFIGURE_ENV+=	LDFLAGS=${LDFLAGS:Q}
@@ -59,3 +63,4 @@ INSTALL_UNSTRIPPED=	yes
 #	${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/config/gnu/
 
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../archivers/zstd/buildlink3.mk"
diff --git a/ocaml/PLIST b/ocaml/PLIST
index a16d0e763c..aad76470d9 100644
--- a/ocaml/PLIST
+++ b/ocaml/PLIST
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.57 2022/05/24 18:25:38 jaapb Exp $
+@comment $NetBSD$
 bin/ocaml
 bin/ocamlc
 bin/ocamlc.byte
 ${PLIST.ocaml-opt}bin/ocamlc.opt
 bin/ocamlcmt
 bin/ocamlcp
-bin/ocamlcp.byte
-${PLIST.ocaml-opt}bin/ocamlcp.opt
 bin/ocamldebug
 bin/ocamldep
 bin/ocamldep.byte
@@ -17,23 +15,15 @@ bin/ocamllex
 bin/ocamllex.byte
 ${PLIST.ocaml-opt}bin/ocamllex.opt
 bin/ocamlmklib
-bin/ocamlmklib.byte
-${PLIST.ocaml-opt}bin/ocamlmklib.opt
 bin/ocamlmktop
-bin/ocamlmktop.byte
-${PLIST.ocaml-opt}bin/ocamlmktop.opt
 bin/ocamlobjinfo
 bin/ocamlobjinfo.byte
 ${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
+${PLIST.ocaml-opt}bin/ocamloptp
 bin/ocamlprof
-bin/ocamlprof.byte
-${PLIST.ocaml-opt}bin/ocamlprof.opt
 bin/ocamlrun
 bin/ocamlrund
 bin/ocamlruni
@@ -47,13 +37,6 @@ lib/ocaml/arrayLabels.ml
 lib/ocaml/arrayLabels.mli
 lib/ocaml/atomic.ml
 lib/ocaml/atomic.mli
-${PLIST.ocaml-opt}lib/ocaml/bigarray.a
-lib/ocaml/bigarray.cma
-lib/ocaml/bigarray.cmi
-lib/ocaml/bigarray.cmti
-${PLIST.ocaml-opt}lib/ocaml/bigarray.cmx
-${PLIST.ocaml-opt}lib/ocaml/bigarray.cmxa
-${PLIST.ocaml-opt}lib/ocaml/bigarray.cmxs
 lib/ocaml/bigarray.ml
 lib/ocaml/bigarray.mli
 lib/ocaml/bool.ml
@@ -67,15 +50,17 @@ lib/ocaml/bytesLabels.mli
 lib/ocaml/callback.ml
 lib/ocaml/callback.mli
 lib/ocaml/caml/address_class.h
+lib/ocaml/caml/addrmap.h
 lib/ocaml/caml/alloc.h
+lib/ocaml/caml/atomic_refcount.h
 lib/ocaml/caml/backtrace.h
 lib/ocaml/caml/backtrace_prim.h
 lib/ocaml/caml/bigarray.h
+lib/ocaml/caml/blake2.h
 lib/ocaml/caml/callback.h
+lib/ocaml/caml/camlatomic.h
 lib/ocaml/caml/codefrag.h
-lib/ocaml/caml/compact.h
 lib/ocaml/caml/compare.h
-lib/ocaml/caml/compatibility.h
 lib/ocaml/caml/config.h
 lib/ocaml/caml/custom.h
 lib/ocaml/caml/debugger.h
@@ -83,14 +68,15 @@ lib/ocaml/caml/domain.h
 lib/ocaml/caml/domain_state.h
 lib/ocaml/caml/domain_state.tbl
 lib/ocaml/caml/dynlink.h
-lib/ocaml/caml/eventlog.h
 lib/ocaml/caml/exec.h
 lib/ocaml/caml/fail.h
+lib/ocaml/caml/fiber.h
 lib/ocaml/caml/finalise.h
 lib/ocaml/caml/fix_code.h
-lib/ocaml/caml/freelist.h
+lib/ocaml/caml/frame_descriptors.h
 lib/ocaml/caml/gc.h
 lib/ocaml/caml/gc_ctrl.h
+lib/ocaml/caml/gc_stats.h
 lib/ocaml/caml/globroots.h
 lib/ocaml/caml/hash.h
 lib/ocaml/caml/hooks.h
@@ -100,6 +86,7 @@ lib/ocaml/caml/interp.h
 lib/ocaml/caml/intext.h
 lib/ocaml/caml/io.h
 lib/ocaml/caml/jumptbl.h
+lib/ocaml/caml/lf_skiplist.h
 lib/ocaml/caml/m.h
 lib/ocaml/caml/major_gc.h
 lib/ocaml/caml/md5.h
@@ -110,36 +97,30 @@ lib/ocaml/caml/misc.h
 lib/ocaml/caml/mlvalues.h
 lib/ocaml/caml/opnames.h
 lib/ocaml/caml/osdeps.h
+lib/ocaml/caml/platform.h
 lib/ocaml/caml/prims.h
 lib/ocaml/caml/printexc.h
 lib/ocaml/caml/reverse.h
 lib/ocaml/caml/roots.h
+lib/ocaml/caml/runtime_events.h
+lib/ocaml/caml/runtime_events_consumer.h
 lib/ocaml/caml/s.h
+lib/ocaml/caml/shared_heap.h
 lib/ocaml/caml/signals.h
-lib/ocaml/caml/signals_machdep.h
+lib/ocaml/caml/sizeclasses.h
 lib/ocaml/caml/skiplist.h
 lib/ocaml/caml/socketaddr.h
 lib/ocaml/caml/stack.h
-lib/ocaml/caml/stacks.h
 lib/ocaml/caml/startup.h
 lib/ocaml/caml/startup_aux.h
+lib/ocaml/caml/sync.h
 lib/ocaml/caml/sys.h
 lib/ocaml/caml/threads.h
-lib/ocaml/caml/ui.h
+lib/ocaml/caml/tsan.h
 lib/ocaml/caml/unixsupport.h
 lib/ocaml/caml/version.h
 lib/ocaml/caml/weak.h
 lib/ocaml/caml/winsupport.h
-lib/ocaml/camlheader
-lib/ocaml/camlheader_ur
-lib/ocaml/camlheaderd
-lib/ocaml/camlheaderi
-lib/ocaml/camlinternalAtomic.cmi
-lib/ocaml/camlinternalAtomic.cmt
-lib/ocaml/camlinternalAtomic.cmti
-${PLIST.ocaml-opt}lib/ocaml/camlinternalAtomic.cmx
-lib/ocaml/camlinternalAtomic.ml
-lib/ocaml/camlinternalAtomic.mli
 lib/ocaml/camlinternalFormat.cmi
 lib/ocaml/camlinternalFormat.cmt
 lib/ocaml/camlinternalFormat.cmti
@@ -172,60 +153,65 @@ lib/ocaml/camlinternalOO.ml
 lib/ocaml/camlinternalOO.mli
 lib/ocaml/char.ml
 lib/ocaml/char.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/CSE.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/CSE.cmt
+lib/ocaml/compiler-libs/CSE.cmi
+lib/ocaml/compiler-libs/CSE.cmt
+lib/ocaml/compiler-libs/CSE.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/CSE.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/CSEgen.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/CSEgen.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/CSEgen.cmti
+lib/ocaml/compiler-libs/CSE.mli
+lib/ocaml/compiler-libs/CSEgen.cmi
+lib/ocaml/compiler-libs/CSEgen.cmt
+lib/ocaml/compiler-libs/CSEgen.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/CSEgen.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/CSEgen.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/afl_instrument.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/afl_instrument.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/afl_instrument.cmti
+lib/ocaml/compiler-libs/CSEgen.mli
+lib/ocaml/compiler-libs/META
+lib/ocaml/compiler-libs/afl_instrument.cmi
+lib/ocaml/compiler-libs/afl_instrument.cmt
+lib/ocaml/compiler-libs/afl_instrument.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/afl_instrument.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/afl_instrument.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/alias_analysis.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/alias_analysis.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/alias_analysis.cmti
+lib/ocaml/compiler-libs/afl_instrument.mli
+lib/ocaml/compiler-libs/alias_analysis.cmi
+lib/ocaml/compiler-libs/alias_analysis.cmt
+lib/ocaml/compiler-libs/alias_analysis.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/alias_analysis.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/alias_analysis.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/allocated_const.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/allocated_const.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/allocated_const.cmti
+lib/ocaml/compiler-libs/alias_analysis.mli
+lib/ocaml/compiler-libs/allocated_const.cmi
+lib/ocaml/compiler-libs/allocated_const.cmt
+lib/ocaml/compiler-libs/allocated_const.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/allocated_const.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/allocated_const.mli
+lib/ocaml/compiler-libs/allocated_const.mli
 lib/ocaml/compiler-libs/annot.cmi
 lib/ocaml/compiler-libs/annot.cmti
 lib/ocaml/compiler-libs/annot.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/arch.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/arch.cmt
+lib/ocaml/compiler-libs/arch.cmi
+lib/ocaml/compiler-libs/arch.cmt
+lib/ocaml/compiler-libs/arch.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/arch.cmx
+lib/ocaml/compiler-libs/arch.mli
 lib/ocaml/compiler-libs/arg_helper.cmi
 lib/ocaml/compiler-libs/arg_helper.cmt
 lib/ocaml/compiler-libs/arg_helper.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/arg_helper.cmx
 lib/ocaml/compiler-libs/arg_helper.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmgen.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmgen.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmgen.cmti
+lib/ocaml/compiler-libs/asmgen.cmi
+lib/ocaml/compiler-libs/asmgen.cmt
+lib/ocaml/compiler-libs/asmgen.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmgen.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmgen.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmlibrarian.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmlibrarian.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmlibrarian.cmti
+lib/ocaml/compiler-libs/asmgen.mli
+lib/ocaml/compiler-libs/asmlibrarian.cmi
+lib/ocaml/compiler-libs/asmlibrarian.cmt
+lib/ocaml/compiler-libs/asmlibrarian.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmlibrarian.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmlibrarian.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmlink.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmlink.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmlink.cmti
+lib/ocaml/compiler-libs/asmlibrarian.mli
+lib/ocaml/compiler-libs/asmlink.cmi
+lib/ocaml/compiler-libs/asmlink.cmt
+lib/ocaml/compiler-libs/asmlink.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmlink.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmlink.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmpackager.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmpackager.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmpackager.cmti
+lib/ocaml/compiler-libs/asmlink.mli
+lib/ocaml/compiler-libs/asmpackager.cmi
+lib/ocaml/compiler-libs/asmpackager.cmt
+lib/ocaml/compiler-libs/asmpackager.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmpackager.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmpackager.mli
+lib/ocaml/compiler-libs/asmpackager.mli
 lib/ocaml/compiler-libs/ast_helper.cmi
 lib/ocaml/compiler-libs/ast_helper.cmt
 lib/ocaml/compiler-libs/ast_helper.cmti
@@ -254,42 +240,42 @@ lib/ocaml/compiler-libs/attr_helper.cmt
 lib/ocaml/compiler-libs/attr_helper.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/attr_helper.cmx
 lib/ocaml/compiler-libs/attr_helper.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/augment_specialised_args.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/augment_specialised_args.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/augment_specialised_args.cmti
+lib/ocaml/compiler-libs/augment_specialised_args.cmi
+lib/ocaml/compiler-libs/augment_specialised_args.cmt
+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/backend_intf.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_intf.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_intf.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_var.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_var.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_var.cmti
+lib/ocaml/compiler-libs/augment_specialised_args.mli
+lib/ocaml/compiler-libs/backend_intf.cmi
+lib/ocaml/compiler-libs/backend_intf.cmti
+lib/ocaml/compiler-libs/backend_intf.mli
+lib/ocaml/compiler-libs/backend_var.cmi
+lib/ocaml/compiler-libs/backend_var.cmt
+lib/ocaml/compiler-libs/backend_var.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_var.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_var.mli
+lib/ocaml/compiler-libs/backend_var.mli
 lib/ocaml/compiler-libs/binutils.cmi
 lib/ocaml/compiler-libs/binutils.cmt
 lib/ocaml/compiler-libs/binutils.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/binutils.cmx
 lib/ocaml/compiler-libs/binutils.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/branch_relaxation.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/branch_relaxation.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/branch_relaxation.cmti
+lib/ocaml/compiler-libs/branch_relaxation.cmi
+lib/ocaml/compiler-libs/branch_relaxation.cmt
+lib/ocaml/compiler-libs/branch_relaxation.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/branch_relaxation.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/branch_relaxation.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/branch_relaxation_intf.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/branch_relaxation_intf.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/branch_relaxation_intf.cmx
+lib/ocaml/compiler-libs/branch_relaxation.mli
+lib/ocaml/compiler-libs/branch_relaxation_intf.cmi
+lib/ocaml/compiler-libs/branch_relaxation_intf.cmti
+lib/ocaml/compiler-libs/branch_relaxation_intf.mli
 lib/ocaml/compiler-libs/btype.cmi
 lib/ocaml/compiler-libs/btype.cmt
 lib/ocaml/compiler-libs/btype.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/btype.cmx
 lib/ocaml/compiler-libs/btype.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/build_export_info.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/build_export_info.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/build_export_info.cmti
+lib/ocaml/compiler-libs/build_export_info.cmi
+lib/ocaml/compiler-libs/build_export_info.cmt
+lib/ocaml/compiler-libs/build_export_info.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/build_export_info.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/build_export_info.mli
+lib/ocaml/compiler-libs/build_export_info.mli
 lib/ocaml/compiler-libs/build_path_prefix_map.cmi
 lib/ocaml/compiler-libs/build_path_prefix_map.cmt
 lib/ocaml/compiler-libs/build_path_prefix_map.cmti
@@ -335,97 +321,99 @@ lib/ocaml/compiler-libs/ccomp.cmt
 lib/ocaml/compiler-libs/ccomp.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ccomp.cmx
 lib/ocaml/compiler-libs/ccomp.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda.cmti
+lib/ocaml/compiler-libs/clambda.cmi
+lib/ocaml/compiler-libs/clambda.cmt
+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
+lib/ocaml/compiler-libs/clambda.mli
+lib/ocaml/compiler-libs/clambda_primitives.cmi
+lib/ocaml/compiler-libs/clambda_primitives.cmt
+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/clambda_primitives.mli
 lib/ocaml/compiler-libs/clflags.cmi
 lib/ocaml/compiler-libs/clflags.cmt
 lib/ocaml/compiler-libs/clflags.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clflags.cmx
 lib/ocaml/compiler-libs/clflags.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure.cmti
+lib/ocaml/compiler-libs/closure.cmi
+lib/ocaml/compiler-libs/closure.cmt
+lib/ocaml/compiler-libs/closure.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion.cmti
+lib/ocaml/compiler-libs/closure.mli
+lib/ocaml/compiler-libs/closure_conversion.cmi
+lib/ocaml/compiler-libs/closure_conversion.cmt
+lib/ocaml/compiler-libs/closure_conversion.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion_aux.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion_aux.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion_aux.cmti
+lib/ocaml/compiler-libs/closure_conversion.mli
+lib/ocaml/compiler-libs/closure_conversion_aux.cmi
+lib/ocaml/compiler-libs/closure_conversion_aux.cmt
+lib/ocaml/compiler-libs/closure_conversion_aux.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion_aux.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_conversion_aux.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_element.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_element.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_element.cmti
+lib/ocaml/compiler-libs/closure_conversion_aux.mli
+lib/ocaml/compiler-libs/closure_element.cmi
+lib/ocaml/compiler-libs/closure_element.cmt
+lib/ocaml/compiler-libs/closure_element.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_element.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_element.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.cmti
+lib/ocaml/compiler-libs/closure_element.mli
+lib/ocaml/compiler-libs/closure_id.cmi
+lib/ocaml/compiler-libs/closure_id.cmt
+lib/ocaml/compiler-libs/closure_id.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_id.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_middle_end.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_middle_end.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_middle_end.cmti
+lib/ocaml/compiler-libs/closure_id.mli
+lib/ocaml/compiler-libs/closure_middle_end.cmi
+lib/ocaml/compiler-libs/closure_middle_end.cmt
+lib/ocaml/compiler-libs/closure_middle_end.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_middle_end.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_middle_end.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_offsets.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_offsets.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_offsets.cmti
+lib/ocaml/compiler-libs/closure_middle_end.mli
+lib/ocaml/compiler-libs/closure_offsets.cmi
+lib/ocaml/compiler-libs/closure_offsets.cmt
+lib/ocaml/compiler-libs/closure_offsets.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_offsets.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_offsets.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_origin.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_origin.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_origin.cmti
+lib/ocaml/compiler-libs/closure_offsets.mli
+lib/ocaml/compiler-libs/closure_origin.cmi
+lib/ocaml/compiler-libs/closure_origin.cmt
+lib/ocaml/compiler-libs/closure_origin.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_origin.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_origin.mli
+lib/ocaml/compiler-libs/closure_origin.mli
 lib/ocaml/compiler-libs/cmi_format.cmi
 lib/ocaml/compiler-libs/cmi_format.cmt
 lib/ocaml/compiler-libs/cmi_format.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmi_format.cmx
 lib/ocaml/compiler-libs/cmi_format.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm.cmti
+lib/ocaml/compiler-libs/cmm.cmi
+lib/ocaml/compiler-libs/cmm.cmt
+lib/ocaml/compiler-libs/cmm.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_helpers.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_helpers.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_helpers.cmti
+lib/ocaml/compiler-libs/cmm.mli
+lib/ocaml/compiler-libs/cmm_helpers.cmi
+lib/ocaml/compiler-libs/cmm_helpers.cmt
+lib/ocaml/compiler-libs/cmm_helpers.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_helpers.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_helpers.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_invariants.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_invariants.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_invariants.cmti
+lib/ocaml/compiler-libs/cmm_helpers.mli
+lib/ocaml/compiler-libs/cmm_invariants.cmi
+lib/ocaml/compiler-libs/cmm_invariants.cmt
+lib/ocaml/compiler-libs/cmm_invariants.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_invariants.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmm_invariants.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmti
+lib/ocaml/compiler-libs/cmm_invariants.mli
+lib/ocaml/compiler-libs/cmmgen.cmi
+lib/ocaml/compiler-libs/cmmgen.cmt
+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
+lib/ocaml/compiler-libs/cmmgen.mli
+lib/ocaml/compiler-libs/cmmgen_state.cmi
+lib/ocaml/compiler-libs/cmmgen_state.cmt
+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/cmmgen_state.mli
 lib/ocaml/compiler-libs/cmo_format.cmi
 lib/ocaml/compiler-libs/cmo_format.cmti
 lib/ocaml/compiler-libs/cmo_format.mli
 lib/ocaml/compiler-libs/cmt2annot.cmi
 lib/ocaml/compiler-libs/cmt2annot.cmt
+lib/ocaml/compiler-libs/cmt2annot.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmt2annot.cmx
+lib/ocaml/compiler-libs/cmt2annot.mli
 lib/ocaml/compiler-libs/cmt_format.cmi
 lib/ocaml/compiler-libs/cmt_format.cmt
 lib/ocaml/compiler-libs/cmt_format.cmti
@@ -437,26 +425,26 @@ lib/ocaml/compiler-libs/cmx_format.mli
 lib/ocaml/compiler-libs/cmxs_format.cmi
 lib/ocaml/compiler-libs/cmxs_format.cmti
 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
+lib/ocaml/compiler-libs/coloring.cmi
+lib/ocaml/compiler-libs/coloring.cmt
+lib/ocaml/compiler-libs/coloring.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/coloring.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/coloring.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/comballoc.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/comballoc.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/comballoc.cmti
+lib/ocaml/compiler-libs/coloring.mli
+lib/ocaml/compiler-libs/comballoc.cmi
+lib/ocaml/compiler-libs/comballoc.cmt
+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/comballoc.mli
 lib/ocaml/compiler-libs/compenv.cmi
 lib/ocaml/compiler-libs/compenv.cmt
 lib/ocaml/compiler-libs/compenv.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compenv.cmx
 lib/ocaml/compiler-libs/compenv.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilation_unit.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilation_unit.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilation_unit.cmti
+lib/ocaml/compiler-libs/compilation_unit.cmi
+lib/ocaml/compiler-libs/compilation_unit.cmt
+lib/ocaml/compiler-libs/compilation_unit.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilation_unit.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilation_unit.mli
+lib/ocaml/compiler-libs/compilation_unit.mli
 lib/ocaml/compiler-libs/compile.cmi
 lib/ocaml/compiler-libs/compile.cmt
 lib/ocaml/compiler-libs/compile.cmti
@@ -467,51 +455,64 @@ lib/ocaml/compiler-libs/compile_common.cmt
 lib/ocaml/compiler-libs/compile_common.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compile_common.cmx
 lib/ocaml/compiler-libs/compile_common.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilenv.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilenv.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilenv.cmti
+lib/ocaml/compiler-libs/compilenv.cmi
+lib/ocaml/compiler-libs/compilenv.cmt
+lib/ocaml/compiler-libs/compilenv.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilenv.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilenv.mli
+lib/ocaml/compiler-libs/compilenv.mli
 lib/ocaml/compiler-libs/compmisc.cmi
 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/compression.cmi
+lib/ocaml/compiler-libs/compression.cmt
+lib/ocaml/compiler-libs/compression.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compression.cmx
+lib/ocaml/compiler-libs/compression.mli
 lib/ocaml/compiler-libs/config.cmi
 lib/ocaml/compiler-libs/config.cmt
 lib/ocaml/compiler-libs/config.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/config.cmx
 lib/ocaml/compiler-libs/config.mli
+lib/ocaml/compiler-libs/config_boot.cmi
+lib/ocaml/compiler-libs/config_boot.cmt
+lib/ocaml/compiler-libs/config_boot.cmti
+lib/ocaml/compiler-libs/config_boot.mli
+lib/ocaml/compiler-libs/config_main.cmi
+lib/ocaml/compiler-libs/config_main.cmt
+lib/ocaml/compiler-libs/config_main.cmti
+lib/ocaml/compiler-libs/config_main.mli
 lib/ocaml/compiler-libs/consistbl.cmi
 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
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/convert_primitives.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/convert_primitives.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/convert_primitives.cmti
+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
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/convert_primitives.mli
+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
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ctype.cmx
 lib/ocaml/compiler-libs/ctype.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/dataflow.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/dataflow.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/dataflow.cmti
+lib/ocaml/compiler-libs/dataflow.cmi
+lib/ocaml/compiler-libs/dataflow.cmt
+lib/ocaml/compiler-libs/dataflow.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/dataflow.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/dataflow.mli
+lib/ocaml/compiler-libs/dataflow.mli
 lib/ocaml/compiler-libs/datarepr.cmi
 lib/ocaml/compiler-libs/datarepr.cmt
 lib/ocaml/compiler-libs/datarepr.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/datarepr.cmx
 lib/ocaml/compiler-libs/datarepr.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/deadcode.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/deadcode.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/deadcode.cmti
+lib/ocaml/compiler-libs/deadcode.cmi
+lib/ocaml/compiler-libs/deadcode.cmt
+lib/ocaml/compiler-libs/deadcode.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/deadcode.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/deadcode.mli
+lib/ocaml/compiler-libs/deadcode.mli
 lib/ocaml/compiler-libs/debuginfo.cmi
 lib/ocaml/compiler-libs/debuginfo.cmt
 lib/ocaml/compiler-libs/debuginfo.cmti
@@ -547,29 +548,29 @@ lib/ocaml/compiler-libs/domainstate.cmt
 lib/ocaml/compiler-libs/domainstate.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/domainstate.cmx
 lib/ocaml/compiler-libs/domainstate.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/effect_analysis.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/effect_analysis.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/effect_analysis.cmti
+lib/ocaml/compiler-libs/effect_analysis.cmi
+lib/ocaml/compiler-libs/effect_analysis.cmt
+lib/ocaml/compiler-libs/effect_analysis.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/effect_analysis.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/effect_analysis.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emit.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emit.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emit.cmti
+lib/ocaml/compiler-libs/effect_analysis.mli
+lib/ocaml/compiler-libs/emit.cmi
+lib/ocaml/compiler-libs/emit.cmt
+lib/ocaml/compiler-libs/emit.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emit.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emit.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emitaux.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emitaux.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emitaux.cmti
+lib/ocaml/compiler-libs/emit.mli
+lib/ocaml/compiler-libs/emitaux.cmi
+lib/ocaml/compiler-libs/emitaux.cmt
+lib/ocaml/compiler-libs/emitaux.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emitaux.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emitaux.mli
+lib/ocaml/compiler-libs/emitaux.mli
 lib/ocaml/compiler-libs/emitcode.cmi
 lib/ocaml/compiler-libs/emitcode.cmt
 lib/ocaml/compiler-libs/emitcode.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emitcode.cmx
 lib/ocaml/compiler-libs/emitcode.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emitenv.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emitenv.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emitenv.mli
+lib/ocaml/compiler-libs/emitenv.cmi
+lib/ocaml/compiler-libs/emitenv.cmti
+lib/ocaml/compiler-libs/emitenv.mli
 lib/ocaml/compiler-libs/env.cmi
 lib/ocaml/compiler-libs/env.cmt
 lib/ocaml/compiler-libs/env.cmti
@@ -590,78 +591,80 @@ lib/ocaml/compiler-libs/errortrace.cmt
 lib/ocaml/compiler-libs/errortrace.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/errortrace.cmx
 lib/ocaml/compiler-libs/errortrace.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_id.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_id.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_id.cmti
+lib/ocaml/compiler-libs/export_id.cmi
+lib/ocaml/compiler-libs/export_id.cmt
+lib/ocaml/compiler-libs/export_id.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_id.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_id.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_info.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_info.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_info.cmti
+lib/ocaml/compiler-libs/export_id.mli
+lib/ocaml/compiler-libs/export_info.cmi
+lib/ocaml/compiler-libs/export_info.cmt
+lib/ocaml/compiler-libs/export_info.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_info.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_info.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_info_for_pack.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_info_for_pack.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_info_for_pack.cmti
+lib/ocaml/compiler-libs/export_info.mli
+lib/ocaml/compiler-libs/export_info_for_pack.cmi
+lib/ocaml/compiler-libs/export_info_for_pack.cmt
+lib/ocaml/compiler-libs/export_info_for_pack.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_info_for_pack.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/export_info_for_pack.mli
+lib/ocaml/compiler-libs/export_info_for_pack.mli
 lib/ocaml/compiler-libs/expunge.cmi
 lib/ocaml/compiler-libs/expunge.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/extract_projections.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/extract_projections.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/extract_projections.cmti
+lib/ocaml/compiler-libs/expunge.cmti
+lib/ocaml/compiler-libs/expunge.mli
+lib/ocaml/compiler-libs/extract_projections.cmi
+lib/ocaml/compiler-libs/extract_projections.cmt
+lib/ocaml/compiler-libs/extract_projections.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/extract_projections.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/extract_projections.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/find_recursive_functions.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/find_recursive_functions.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/find_recursive_functions.cmti
+lib/ocaml/compiler-libs/extract_projections.mli
+lib/ocaml/compiler-libs/find_recursive_functions.cmi
+lib/ocaml/compiler-libs/find_recursive_functions.cmt
+lib/ocaml/compiler-libs/find_recursive_functions.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/find_recursive_functions.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/find_recursive_functions.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda.cmti
+lib/ocaml/compiler-libs/find_recursive_functions.mli
+lib/ocaml/compiler-libs/flambda.cmi
+lib/ocaml/compiler-libs/flambda.cmt
+lib/ocaml/compiler-libs/flambda.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_invariants.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_invariants.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_invariants.cmti
+lib/ocaml/compiler-libs/flambda.mli
+lib/ocaml/compiler-libs/flambda_invariants.cmi
+lib/ocaml/compiler-libs/flambda_invariants.cmt
+lib/ocaml/compiler-libs/flambda_invariants.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_invariants.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_invariants.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_iterators.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_iterators.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_iterators.cmti
+lib/ocaml/compiler-libs/flambda_invariants.mli
+lib/ocaml/compiler-libs/flambda_iterators.cmi
+lib/ocaml/compiler-libs/flambda_iterators.cmt
+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
+lib/ocaml/compiler-libs/flambda_iterators.mli
+lib/ocaml/compiler-libs/flambda_middle_end.cmi
+lib/ocaml/compiler-libs/flambda_middle_end.cmt
+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
+lib/ocaml/compiler-libs/flambda_middle_end.mli
+lib/ocaml/compiler-libs/flambda_to_clambda.cmi
+lib/ocaml/compiler-libs/flambda_to_clambda.cmt
+lib/ocaml/compiler-libs/flambda_to_clambda.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_to_clambda.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_to_clambda.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_utils.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_utils.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_utils.cmti
+lib/ocaml/compiler-libs/flambda_to_clambda.mli
+lib/ocaml/compiler-libs/flambda_utils.cmi
+lib/ocaml/compiler-libs/flambda_utils.cmt
+lib/ocaml/compiler-libs/flambda_utils.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_utils.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_utils.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/freshening.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/freshening.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/freshening.cmti
+lib/ocaml/compiler-libs/flambda_utils.mli
+lib/ocaml/compiler-libs/freshening.cmi
+lib/ocaml/compiler-libs/freshening.cmt
+lib/ocaml/compiler-libs/freshening.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/freshening.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/freshening.mli
+lib/ocaml/compiler-libs/freshening.mli
 lib/ocaml/compiler-libs/genprintval.cmi
 lib/ocaml/compiler-libs/genprintval.cmt
 lib/ocaml/compiler-libs/genprintval.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/genprintval.cmx
 lib/ocaml/compiler-libs/genprintval.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/id_types.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/id_types.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/id_types.cmti
+lib/ocaml/compiler-libs/id_types.cmi
+lib/ocaml/compiler-libs/id_types.cmt
+lib/ocaml/compiler-libs/id_types.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/id_types.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/id_types.mli
+lib/ocaml/compiler-libs/id_types.mli
 lib/ocaml/compiler-libs/ident.cmi
 lib/ocaml/compiler-libs/ident.cmt
 lib/ocaml/compiler-libs/ident.cmti
@@ -672,11 +675,11 @@ lib/ocaml/compiler-libs/identifiable.cmt
 lib/ocaml/compiler-libs/identifiable.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/identifiable.cmx
 lib/ocaml/compiler-libs/identifiable.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/import_approx.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/import_approx.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/import_approx.cmti
+lib/ocaml/compiler-libs/import_approx.cmi
+lib/ocaml/compiler-libs/import_approx.cmt
+lib/ocaml/compiler-libs/import_approx.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/import_approx.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/import_approx.mli
+lib/ocaml/compiler-libs/import_approx.mli
 lib/ocaml/compiler-libs/includeclass.cmi
 lib/ocaml/compiler-libs/includeclass.cmt
 lib/ocaml/compiler-libs/includeclass.cmti
@@ -697,54 +700,54 @@ lib/ocaml/compiler-libs/includemod_errorprinter.cmt
 lib/ocaml/compiler-libs/includemod_errorprinter.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/includemod_errorprinter.cmx
 lib/ocaml/compiler-libs/includemod_errorprinter.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inconstant_idents.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inconstant_idents.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inconstant_idents.cmti
+lib/ocaml/compiler-libs/inconstant_idents.cmi
+lib/ocaml/compiler-libs/inconstant_idents.cmt
+lib/ocaml/compiler-libs/inconstant_idents.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inconstant_idents.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inconstant_idents.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmti
+lib/ocaml/compiler-libs/inconstant_idents.mli
+lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmi
+lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmt
+lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inline_and_simplify.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inline_and_simplify.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inline_and_simplify.cmti
+lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.mli
+lib/ocaml/compiler-libs/inline_and_simplify.cmi
+lib/ocaml/compiler-libs/inline_and_simplify.cmt
+lib/ocaml/compiler-libs/inline_and_simplify.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inline_and_simplify.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inline_and_simplify.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inline_and_simplify_aux.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inline_and_simplify_aux.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inline_and_simplify_aux.cmti
+lib/ocaml/compiler-libs/inline_and_simplify.mli
+lib/ocaml/compiler-libs/inline_and_simplify_aux.cmi
+lib/ocaml/compiler-libs/inline_and_simplify_aux.cmt
+lib/ocaml/compiler-libs/inline_and_simplify_aux.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inline_and_simplify_aux.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inline_and_simplify_aux.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_cost.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_cost.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_cost.cmti
+lib/ocaml/compiler-libs/inline_and_simplify_aux.mli
+lib/ocaml/compiler-libs/inlining_cost.cmi
+lib/ocaml/compiler-libs/inlining_cost.cmt
+lib/ocaml/compiler-libs/inlining_cost.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_cost.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_cost.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_decision.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_decision.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_decision.cmti
+lib/ocaml/compiler-libs/inlining_cost.mli
+lib/ocaml/compiler-libs/inlining_decision.cmi
+lib/ocaml/compiler-libs/inlining_decision.cmt
+lib/ocaml/compiler-libs/inlining_decision.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_decision.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_decision.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_decision_intf.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_decision_intf.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_decision_intf.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_stats.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_stats.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_stats.cmti
+lib/ocaml/compiler-libs/inlining_decision.mli
+lib/ocaml/compiler-libs/inlining_decision_intf.cmi
+lib/ocaml/compiler-libs/inlining_decision_intf.cmti
+lib/ocaml/compiler-libs/inlining_decision_intf.mli
+lib/ocaml/compiler-libs/inlining_stats.cmi
+lib/ocaml/compiler-libs/inlining_stats.cmt
+lib/ocaml/compiler-libs/inlining_stats.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_stats.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_stats.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_stats_types.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_stats_types.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_stats_types.cmti
+lib/ocaml/compiler-libs/inlining_stats.mli
+lib/ocaml/compiler-libs/inlining_stats_types.cmi
+lib/ocaml/compiler-libs/inlining_stats_types.cmt
+lib/ocaml/compiler-libs/inlining_stats_types.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_stats_types.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_stats_types.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_transforms.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_transforms.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_transforms.cmti
+lib/ocaml/compiler-libs/inlining_stats_types.mli
+lib/ocaml/compiler-libs/inlining_transforms.cmi
+lib/ocaml/compiler-libs/inlining_transforms.cmt
+lib/ocaml/compiler-libs/inlining_transforms.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_transforms.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_transforms.mli
+lib/ocaml/compiler-libs/inlining_transforms.mli
 lib/ocaml/compiler-libs/instruct.cmi
 lib/ocaml/compiler-libs/instruct.cmt
 lib/ocaml/compiler-libs/instruct.cmti
@@ -755,26 +758,26 @@ lib/ocaml/compiler-libs/int_replace_polymorphic_compare.cmt
 lib/ocaml/compiler-libs/int_replace_polymorphic_compare.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/int_replace_polymorphic_compare.cmx
 lib/ocaml/compiler-libs/int_replace_polymorphic_compare.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/interf.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/interf.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/interf.cmti
+lib/ocaml/compiler-libs/interf.cmi
+lib/ocaml/compiler-libs/interf.cmt
+lib/ocaml/compiler-libs/interf.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/interf.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/interf.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/internal_variable_names.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/internal_variable_names.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/internal_variable_names.cmti
+lib/ocaml/compiler-libs/interf.mli
+lib/ocaml/compiler-libs/internal_variable_names.cmi
+lib/ocaml/compiler-libs/internal_variable_names.cmt
+lib/ocaml/compiler-libs/internal_variable_names.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/internal_variable_names.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/internal_variable_names.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/interval.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/interval.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/interval.cmti
+lib/ocaml/compiler-libs/internal_variable_names.mli
+lib/ocaml/compiler-libs/interval.cmi
+lib/ocaml/compiler-libs/interval.cmt
+lib/ocaml/compiler-libs/interval.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/interval.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/interval.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/invariant_params.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/invariant_params.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/invariant_params.cmti
+lib/ocaml/compiler-libs/interval.mli
+lib/ocaml/compiler-libs/invariant_params.cmi
+lib/ocaml/compiler-libs/invariant_params.cmt
+lib/ocaml/compiler-libs/invariant_params.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/invariant_params.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/invariant_params.mli
+lib/ocaml/compiler-libs/invariant_params.mli
 lib/ocaml/compiler-libs/lambda.cmi
 lib/ocaml/compiler-libs/lambda.cmt
 lib/ocaml/compiler-libs/lambda.cmti
@@ -790,51 +793,51 @@ lib/ocaml/compiler-libs/lexer.cmt
 lib/ocaml/compiler-libs/lexer.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lexer.cmx
 lib/ocaml/compiler-libs/lexer.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_code.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_code.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_code.cmti
+lib/ocaml/compiler-libs/lift_code.cmi
+lib/ocaml/compiler-libs/lift_code.cmt
+lib/ocaml/compiler-libs/lift_code.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_code.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_code.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_constants.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_constants.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_constants.cmti
+lib/ocaml/compiler-libs/lift_code.mli
+lib/ocaml/compiler-libs/lift_constants.cmi
+lib/ocaml/compiler-libs/lift_constants.cmt
+lib/ocaml/compiler-libs/lift_constants.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_constants.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_constants.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmti
+lib/ocaml/compiler-libs/lift_constants.mli
+lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmi
+lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmt
+lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear.cmti
+lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.mli
+lib/ocaml/compiler-libs/linear.cmi
+lib/ocaml/compiler-libs/linear.cmt
+lib/ocaml/compiler-libs/linear.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear_format.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear_format.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear_format.cmti
+lib/ocaml/compiler-libs/linear.mli
+lib/ocaml/compiler-libs/linear_format.cmi
+lib/ocaml/compiler-libs/linear_format.cmt
+lib/ocaml/compiler-libs/linear_format.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear_format.cmx
 lib/ocaml/compiler-libs/linear_format.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmti
+lib/ocaml/compiler-libs/linearize.cmi
+lib/ocaml/compiler-libs/linearize.cmt
+lib/ocaml/compiler-libs/linearize.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linkage_name.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linkage_name.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linkage_name.cmti
+lib/ocaml/compiler-libs/linearize.mli
+lib/ocaml/compiler-libs/linkage_name.cmi
+lib/ocaml/compiler-libs/linkage_name.cmt
+lib/ocaml/compiler-libs/linkage_name.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linkage_name.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linkage_name.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linscan.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linscan.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linscan.cmti
+lib/ocaml/compiler-libs/linkage_name.mli
+lib/ocaml/compiler-libs/linscan.cmi
+lib/ocaml/compiler-libs/linscan.cmt
+lib/ocaml/compiler-libs/linscan.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linscan.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linscan.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/liveness.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/liveness.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/liveness.cmti
+lib/ocaml/compiler-libs/linscan.mli
+lib/ocaml/compiler-libs/liveness.cmi
+lib/ocaml/compiler-libs/liveness.cmt
+lib/ocaml/compiler-libs/liveness.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/liveness.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/liveness.mli
+lib/ocaml/compiler-libs/liveness.mli
 lib/ocaml/compiler-libs/load_path.cmi
 lib/ocaml/compiler-libs/load_path.cmt
 lib/ocaml/compiler-libs/load_path.cmti
@@ -855,16 +858,18 @@ lib/ocaml/compiler-libs/longident.cmt
 lib/ocaml/compiler-libs/longident.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/longident.cmx
 lib/ocaml/compiler-libs/longident.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mach.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mach.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mach.cmti
+lib/ocaml/compiler-libs/mach.cmi
+lib/ocaml/compiler-libs/mach.cmt
+lib/ocaml/compiler-libs/mach.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mach.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mach.mli
+lib/ocaml/compiler-libs/mach.mli
 lib/ocaml/compiler-libs/main.cmi
 lib/ocaml/compiler-libs/main.cmo
 lib/ocaml/compiler-libs/main.cmt
+lib/ocaml/compiler-libs/main.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/main.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/main.o
+lib/ocaml/compiler-libs/main.mli
+lib/ocaml/compiler-libs/main.o
 lib/ocaml/compiler-libs/main_args.cmi
 lib/ocaml/compiler-libs/main_args.cmt
 lib/ocaml/compiler-libs/main_args.cmti
@@ -900,31 +905,31 @@ lib/ocaml/compiler-libs/mtype.cmt
 lib/ocaml/compiler-libs/mtype.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mtype.cmx
 lib/ocaml/compiler-libs/mtype.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mutable_variable.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mutable_variable.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mutable_variable.cmti
+lib/ocaml/compiler-libs/mutable_variable.cmi
+lib/ocaml/compiler-libs/mutable_variable.cmt
+lib/ocaml/compiler-libs/mutable_variable.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mutable_variable.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mutable_variable.mli
+lib/ocaml/compiler-libs/mutable_variable.mli
 lib/ocaml/compiler-libs/numbers.cmi
 lib/ocaml/compiler-libs/numbers.cmt
 lib/ocaml/compiler-libs/numbers.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/numbers.cmx
 lib/ocaml/compiler-libs/numbers.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlbytecomp.a
+lib/ocaml/compiler-libs/ocamlbytecomp.a
 lib/ocaml/compiler-libs/ocamlbytecomp.cma
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlbytecomp.cmxa
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlcommon.a
+lib/ocaml/compiler-libs/ocamlbytecomp.cmxa
+lib/ocaml/compiler-libs/ocamlcommon.a
 lib/ocaml/compiler-libs/ocamlcommon.cma
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlcommon.cmxa
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlmiddleend.a
+lib/ocaml/compiler-libs/ocamlcommon.cmxa
+lib/ocaml/compiler-libs/ocamlmiddleend.a
 lib/ocaml/compiler-libs/ocamlmiddleend.cma
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlmiddleend.cmxa
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamloptcomp.a
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamloptcomp.cma
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamloptcomp.cmxa
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamltoplevel.a
+lib/ocaml/compiler-libs/ocamlmiddleend.cmxa
+lib/ocaml/compiler-libs/ocamloptcomp.a
+lib/ocaml/compiler-libs/ocamloptcomp.cma
+lib/ocaml/compiler-libs/ocamloptcomp.cmxa
+lib/ocaml/compiler-libs/ocamltoplevel.a
 lib/ocaml/compiler-libs/ocamltoplevel.cma
-${PLIST.ocaml-opt}${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamltoplevel.cmxa
+lib/ocaml/compiler-libs/ocamltoplevel.cmxa
 lib/ocaml/compiler-libs/opcodes.cmi
 lib/ocaml/compiler-libs/opcodes.cmt
 lib/ocaml/compiler-libs/opcodes.cmti
@@ -935,34 +940,36 @@ lib/ocaml/compiler-libs/oprint.cmt
 lib/ocaml/compiler-libs/oprint.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/oprint.cmx
 lib/ocaml/compiler-libs/oprint.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optcompile.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optcompile.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optcompile.cmti
+lib/ocaml/compiler-libs/optcompile.cmi
+lib/ocaml/compiler-libs/optcompile.cmt
+lib/ocaml/compiler-libs/optcompile.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optcompile.cmx
 lib/ocaml/compiler-libs/optcompile.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/opterrors.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/opterrors.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/opterrors.cmti
+lib/ocaml/compiler-libs/opterrors.cmi
+lib/ocaml/compiler-libs/opterrors.cmt
+lib/ocaml/compiler-libs/opterrors.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/opterrors.cmx
 lib/ocaml/compiler-libs/opterrors.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmain.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmain.cmo
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmain.cmt
+lib/ocaml/compiler-libs/optmain.cmi
+lib/ocaml/compiler-libs/optmain.cmo
+lib/ocaml/compiler-libs/optmain.cmt
+lib/ocaml/compiler-libs/optmain.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmain.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmain.o
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmaindriver.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmaindriver.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmaindriver.cmti
+lib/ocaml/compiler-libs/optmain.mli
+lib/ocaml/compiler-libs/optmain.o
+lib/ocaml/compiler-libs/optmaindriver.cmi
+lib/ocaml/compiler-libs/optmaindriver.cmt
+lib/ocaml/compiler-libs/optmaindriver.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmaindriver.cmx
 lib/ocaml/compiler-libs/optmaindriver.mli
 lib/ocaml/compiler-libs/outcometree.cmi
 lib/ocaml/compiler-libs/outcometree.cmti
 lib/ocaml/compiler-libs/outcometree.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/parameter.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/parameter.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/parameter.cmti
+lib/ocaml/compiler-libs/parameter.cmi
+lib/ocaml/compiler-libs/parameter.cmt
+lib/ocaml/compiler-libs/parameter.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/parameter.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/parameter.mli
+lib/ocaml/compiler-libs/parameter.mli
 lib/ocaml/compiler-libs/parmatch.cmi
 lib/ocaml/compiler-libs/parmatch.cmt
 lib/ocaml/compiler-libs/parmatch.cmti
@@ -981,11 +988,11 @@ lib/ocaml/compiler-libs/parser.mli
 lib/ocaml/compiler-libs/parsetree.cmi
 lib/ocaml/compiler-libs/parsetree.cmti
 lib/ocaml/compiler-libs/parsetree.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/pass_wrapper.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/pass_wrapper.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/pass_wrapper.cmti
+lib/ocaml/compiler-libs/pass_wrapper.cmi
+lib/ocaml/compiler-libs/pass_wrapper.cmt
+lib/ocaml/compiler-libs/pass_wrapper.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/pass_wrapper.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/pass_wrapper.mli
+lib/ocaml/compiler-libs/pass_wrapper.mli
 lib/ocaml/compiler-libs/path.cmi
 lib/ocaml/compiler-libs/path.cmt
 lib/ocaml/compiler-libs/path.cmti
@@ -1001,11 +1008,11 @@ 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
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/polling.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/polling.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/polling.cmti
+lib/ocaml/compiler-libs/polling.cmi
+lib/ocaml/compiler-libs/polling.cmt
+lib/ocaml/compiler-libs/polling.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/polling.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/polling.mli
+lib/ocaml/compiler-libs/polling.mli
 lib/ocaml/compiler-libs/pparse.cmi
 lib/ocaml/compiler-libs/pparse.cmt
 lib/ocaml/compiler-libs/pparse.cmti
@@ -1031,21 +1038,21 @@ lib/ocaml/compiler-libs/printast.cmt
 lib/ocaml/compiler-libs/printast.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printast.cmx
 lib/ocaml/compiler-libs/printast.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda.cmti
+lib/ocaml/compiler-libs/printclambda.cmi
+lib/ocaml/compiler-libs/printclambda.cmt
+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
+lib/ocaml/compiler-libs/printclambda.mli
+lib/ocaml/compiler-libs/printclambda_primitives.cmi
+lib/ocaml/compiler-libs/printclambda_primitives.cmt
+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
+lib/ocaml/compiler-libs/printclambda_primitives.mli
+lib/ocaml/compiler-libs/printcmm.cmi
+lib/ocaml/compiler-libs/printcmm.cmt
+lib/ocaml/compiler-libs/printcmm.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printcmm.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printcmm.mli
+lib/ocaml/compiler-libs/printcmm.mli
 lib/ocaml/compiler-libs/printinstr.cmi
 lib/ocaml/compiler-libs/printinstr.cmt
 lib/ocaml/compiler-libs/printinstr.cmti
@@ -1056,16 +1063,16 @@ lib/ocaml/compiler-libs/printlambda.cmt
 lib/ocaml/compiler-libs/printlambda.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printlambda.cmx
 lib/ocaml/compiler-libs/printlambda.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printlinear.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printlinear.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printlinear.cmti
+lib/ocaml/compiler-libs/printlinear.cmi
+lib/ocaml/compiler-libs/printlinear.cmt
+lib/ocaml/compiler-libs/printlinear.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printlinear.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printlinear.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printmach.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printmach.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printmach.cmti
+lib/ocaml/compiler-libs/printlinear.mli
+lib/ocaml/compiler-libs/printmach.cmi
+lib/ocaml/compiler-libs/printmach.cmt
+lib/ocaml/compiler-libs/printmach.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printmach.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printmach.mli
+lib/ocaml/compiler-libs/printmach.mli
 lib/ocaml/compiler-libs/printpat.cmi
 lib/ocaml/compiler-libs/printpat.cmt
 lib/ocaml/compiler-libs/printpat.cmti
@@ -1081,169 +1088,179 @@ lib/ocaml/compiler-libs/printtyped.cmt
 lib/ocaml/compiler-libs/printtyped.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printtyped.cmx
 lib/ocaml/compiler-libs/printtyped.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/proc.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/proc.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/proc.cmti
+lib/ocaml/compiler-libs/proc.cmi
+lib/ocaml/compiler-libs/proc.cmt
+lib/ocaml/compiler-libs/proc.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/proc.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/proc.mli
+lib/ocaml/compiler-libs/proc.mli
 lib/ocaml/compiler-libs/profile.cmi
 lib/ocaml/compiler-libs/profile.cmt
 lib/ocaml/compiler-libs/profile.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/profile.cmx
 lib/ocaml/compiler-libs/profile.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/projection.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/projection.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/projection.cmti
+lib/ocaml/compiler-libs/projection.cmi
+lib/ocaml/compiler-libs/projection.cmt
+lib/ocaml/compiler-libs/projection.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/projection.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/projection.mli
-lib/ocaml/compiler-libs/rec_check.cmi
-lib/ocaml/compiler-libs/rec_check.cmt
-lib/ocaml/compiler-libs/rec_check.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/rec_check.cmx
-lib/ocaml/compiler-libs/rec_check.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ref_to_variables.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ref_to_variables.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ref_to_variables.cmti
+lib/ocaml/compiler-libs/projection.mli
+lib/ocaml/compiler-libs/ref_to_variables.cmi
+lib/ocaml/compiler-libs/ref_to_variables.cmt
+lib/ocaml/compiler-libs/ref_to_variables.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ref_to_variables.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ref_to_variables.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reg.cmti
+lib/ocaml/compiler-libs/ref_to_variables.mli
+lib/ocaml/compiler-libs/reg.cmi
+lib/ocaml/compiler-libs/reg.cmt
+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/reload.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reload.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reload.cmti
+lib/ocaml/compiler-libs/reg.mli
+lib/ocaml/compiler-libs/reload.cmi
+lib/ocaml/compiler-libs/reload.cmt
+lib/ocaml/compiler-libs/reload.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reload.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reload.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reloadgen.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reloadgen.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reloadgen.cmti
+lib/ocaml/compiler-libs/reload.mli
+lib/ocaml/compiler-libs/reloadgen.cmi
+lib/ocaml/compiler-libs/reloadgen.cmt
+lib/ocaml/compiler-libs/reloadgen.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reloadgen.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/reloadgen.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmti
+lib/ocaml/compiler-libs/reloadgen.mli
+lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmi
+lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmt
+lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_arguments.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_arguments.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_arguments.cmti
+lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.mli
+lib/ocaml/compiler-libs/remove_unused_arguments.cmi
+lib/ocaml/compiler-libs/remove_unused_arguments.cmt
+lib/ocaml/compiler-libs/remove_unused_arguments.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_arguments.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_arguments.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_closure_vars.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_closure_vars.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_closure_vars.cmti
+lib/ocaml/compiler-libs/remove_unused_arguments.mli
+lib/ocaml/compiler-libs/remove_unused_closure_vars.cmi
+lib/ocaml/compiler-libs/remove_unused_closure_vars.cmt
+lib/ocaml/compiler-libs/remove_unused_closure_vars.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_closure_vars.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_closure_vars.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_program_constructs.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_program_constructs.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_program_constructs.cmti
+lib/ocaml/compiler-libs/remove_unused_closure_vars.mli
+lib/ocaml/compiler-libs/remove_unused_program_constructs.cmi
+lib/ocaml/compiler-libs/remove_unused_program_constructs.cmt
+lib/ocaml/compiler-libs/remove_unused_program_constructs.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_program_constructs.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/remove_unused_program_constructs.mli
+lib/ocaml/compiler-libs/remove_unused_program_constructs.mli
 lib/ocaml/compiler-libs/runtimedef.cmi
 lib/ocaml/compiler-libs/runtimedef.cmt
 lib/ocaml/compiler-libs/runtimedef.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/runtimedef.cmx
 lib/ocaml/compiler-libs/runtimedef.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/schedgen.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/schedgen.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/schedgen.cmti
+lib/ocaml/compiler-libs/schedgen.cmi
+lib/ocaml/compiler-libs/schedgen.cmt
+lib/ocaml/compiler-libs/schedgen.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/schedgen.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/schedgen.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/scheduling.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/scheduling.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/scheduling.cmti
+lib/ocaml/compiler-libs/schedgen.mli
+lib/ocaml/compiler-libs/scheduling.cmi
+lib/ocaml/compiler-libs/scheduling.cmt
+lib/ocaml/compiler-libs/scheduling.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/scheduling.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/scheduling.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/selectgen.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/selectgen.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/selectgen.cmti
+lib/ocaml/compiler-libs/scheduling.mli
+lib/ocaml/compiler-libs/selectgen.cmi
+lib/ocaml/compiler-libs/selectgen.cmt
+lib/ocaml/compiler-libs/selectgen.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/selectgen.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/selectgen.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/selection.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/selection.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/selection.cmti
+lib/ocaml/compiler-libs/selectgen.mli
+lib/ocaml/compiler-libs/selection.cmi
+lib/ocaml/compiler-libs/selection.cmt
+lib/ocaml/compiler-libs/selection.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/selection.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/selection.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/semantics_of_primitives.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/semantics_of_primitives.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/semantics_of_primitives.cmti
+lib/ocaml/compiler-libs/selection.mli
+lib/ocaml/compiler-libs/semantics_of_primitives.cmi
+lib/ocaml/compiler-libs/semantics_of_primitives.cmt
+lib/ocaml/compiler-libs/semantics_of_primitives.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/semantics_of_primitives.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/semantics_of_primitives.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/set_of_closures_id.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/set_of_closures_id.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/set_of_closures_id.cmti
+lib/ocaml/compiler-libs/semantics_of_primitives.mli
+lib/ocaml/compiler-libs/set_of_closures_id.cmi
+lib/ocaml/compiler-libs/set_of_closures_id.cmt
+lib/ocaml/compiler-libs/set_of_closures_id.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/set_of_closures_id.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/set_of_closures_id.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/set_of_closures_origin.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/set_of_closures_origin.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/set_of_closures_origin.cmti
+lib/ocaml/compiler-libs/set_of_closures_id.mli
+lib/ocaml/compiler-libs/set_of_closures_origin.cmi
+lib/ocaml/compiler-libs/set_of_closures_origin.cmt
+lib/ocaml/compiler-libs/set_of_closures_origin.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/set_of_closures_origin.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/set_of_closures_origin.mli
+lib/ocaml/compiler-libs/set_of_closures_origin.mli
 lib/ocaml/compiler-libs/shape.cmi
 lib/ocaml/compiler-libs/shape.cmt
 lib/ocaml/compiler-libs/shape.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/shape.cmx
 lib/ocaml/compiler-libs/shape.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/share_constants.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/share_constants.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/share_constants.cmti
+lib/ocaml/compiler-libs/shape_reduce.cmi
+lib/ocaml/compiler-libs/shape_reduce.cmt
+lib/ocaml/compiler-libs/shape_reduce.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/shape_reduce.cmx
+lib/ocaml/compiler-libs/shape_reduce.mli
+lib/ocaml/compiler-libs/share_constants.cmi
+lib/ocaml/compiler-libs/share_constants.cmt
+lib/ocaml/compiler-libs/share_constants.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/share_constants.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/share_constants.mli
+lib/ocaml/compiler-libs/share_constants.mli
 lib/ocaml/compiler-libs/signature_group.cmi
 lib/ocaml/compiler-libs/signature_group.cmt
 lib/ocaml/compiler-libs/signature_group.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/signature_group.cmx
 lib/ocaml/compiler-libs/signature_group.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simple_value_approx.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simple_value_approx.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simple_value_approx.cmti
+lib/ocaml/compiler-libs/simple_value_approx.cmi
+lib/ocaml/compiler-libs/simple_value_approx.cmt
+lib/ocaml/compiler-libs/simple_value_approx.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simple_value_approx.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simple_value_approx.mli
+lib/ocaml/compiler-libs/simple_value_approx.mli
 lib/ocaml/compiler-libs/simplif.cmi
 lib/ocaml/compiler-libs/simplif.cmt
 lib/ocaml/compiler-libs/simplif.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplif.cmx
 lib/ocaml/compiler-libs/simplif.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmti
+lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmi
+lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmt
+lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_boxed_integer_ops.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_common.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_common.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_common.cmti
+lib/ocaml/compiler-libs/simplify_boxed_integer_ops.mli
+lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.cmi
+lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.cmti
+lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.mli
+lib/ocaml/compiler-libs/simplify_common.cmi
+lib/ocaml/compiler-libs/simplify_common.cmt
+lib/ocaml/compiler-libs/simplify_common.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_common.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_common.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_primitives.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_primitives.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_primitives.cmti
+lib/ocaml/compiler-libs/simplify_common.mli
+lib/ocaml/compiler-libs/simplify_primitives.cmi
+lib/ocaml/compiler-libs/simplify_primitives.cmt
+lib/ocaml/compiler-libs/simplify_primitives.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_primitives.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplify_primitives.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/spill.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/spill.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/spill.cmti
+lib/ocaml/compiler-libs/simplify_primitives.mli
+lib/ocaml/compiler-libs/spill.cmi
+lib/ocaml/compiler-libs/spill.cmt
+lib/ocaml/compiler-libs/spill.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/spill.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/spill.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/split.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/split.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/split.cmti
+lib/ocaml/compiler-libs/spill.mli
+lib/ocaml/compiler-libs/split.cmi
+lib/ocaml/compiler-libs/split.cmt
+lib/ocaml/compiler-libs/split.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/split.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/split.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/static_exception.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/static_exception.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/static_exception.cmti
+lib/ocaml/compiler-libs/split.mli
+lib/ocaml/compiler-libs/stackframe.cmi
+lib/ocaml/compiler-libs/stackframe.cmt
+lib/ocaml/compiler-libs/stackframe.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/stackframe.cmx
+lib/ocaml/compiler-libs/stackframe.mli
+lib/ocaml/compiler-libs/stackframegen.cmi
+lib/ocaml/compiler-libs/stackframegen.cmt
+lib/ocaml/compiler-libs/stackframegen.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/stackframegen.cmx
+lib/ocaml/compiler-libs/stackframegen.mli
+lib/ocaml/compiler-libs/static_exception.cmi
+lib/ocaml/compiler-libs/static_exception.cmt
+lib/ocaml/compiler-libs/static_exception.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/static_exception.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/static_exception.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/strmatch.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/strmatch.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/strmatch.cmti
+lib/ocaml/compiler-libs/static_exception.mli
+lib/ocaml/compiler-libs/strmatch.cmi
+lib/ocaml/compiler-libs/strmatch.cmt
+lib/ocaml/compiler-libs/strmatch.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/strmatch.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/strmatch.mli
+lib/ocaml/compiler-libs/strmatch.mli
 lib/ocaml/compiler-libs/strongly_connected_components.cmi
 lib/ocaml/compiler-libs/strongly_connected_components.cmt
 lib/ocaml/compiler-libs/strongly_connected_components.cmti
@@ -1264,11 +1281,11 @@ lib/ocaml/compiler-libs/switch.cmt
 lib/ocaml/compiler-libs/switch.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/switch.cmx
 lib/ocaml/compiler-libs/switch.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/symbol.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/symbol.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/symbol.cmti
+lib/ocaml/compiler-libs/symbol.cmi
+lib/ocaml/compiler-libs/symbol.cmt
+lib/ocaml/compiler-libs/symbol.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/symbol.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/symbol.mli
+lib/ocaml/compiler-libs/symbol.mli
 lib/ocaml/compiler-libs/symtable.cmi
 lib/ocaml/compiler-libs/symtable.cmt
 lib/ocaml/compiler-libs/symtable.cmti
@@ -1279,11 +1296,11 @@ lib/ocaml/compiler-libs/syntaxerr.cmt
 lib/ocaml/compiler-libs/syntaxerr.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/syntaxerr.cmx
 lib/ocaml/compiler-libs/syntaxerr.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tag.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tag.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tag.cmti
+lib/ocaml/compiler-libs/tag.cmi
+lib/ocaml/compiler-libs/tag.cmt
+lib/ocaml/compiler-libs/tag.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tag.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tag.mli
+lib/ocaml/compiler-libs/tag.mli
 lib/ocaml/compiler-libs/targetint.cmi
 lib/ocaml/compiler-libs/targetint.cmt
 lib/ocaml/compiler-libs/targetint.cmti
@@ -1304,6 +1321,11 @@ lib/ocaml/compiler-libs/terminfo.cmt
 lib/ocaml/compiler-libs/terminfo.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/terminfo.cmx
 lib/ocaml/compiler-libs/terminfo.mli
+lib/ocaml/compiler-libs/thread_sanitizer.cmi
+lib/ocaml/compiler-libs/thread_sanitizer.cmt
+lib/ocaml/compiler-libs/thread_sanitizer.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/thread_sanitizer.cmx
+lib/ocaml/compiler-libs/thread_sanitizer.mli
 lib/ocaml/compiler-libs/tmc.cmi
 lib/ocaml/compiler-libs/tmc.cmt
 lib/ocaml/compiler-libs/tmc.cmti
@@ -1324,7 +1346,7 @@ lib/ocaml/compiler-libs/topeval.cmt
 lib/ocaml/compiler-libs/topeval.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/topeval.cmx
 lib/ocaml/compiler-libs/topeval.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tophooks.cmi
+lib/ocaml/compiler-libs/tophooks.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tophooks.cmx
 lib/ocaml/compiler-libs/toploop.cmi
 lib/ocaml/compiler-libs/toploop.cmt
@@ -1336,11 +1358,18 @@ lib/ocaml/compiler-libs/topmain.cmt
 lib/ocaml/compiler-libs/topmain.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/topmain.cmx
 lib/ocaml/compiler-libs/topmain.mli
+lib/ocaml/compiler-libs/topprinters.cmi
+lib/ocaml/compiler-libs/topprinters.cmt
+lib/ocaml/compiler-libs/topprinters.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/topprinters.cmx
+lib/ocaml/compiler-libs/topprinters.mli
 lib/ocaml/compiler-libs/topstart.cmi
 lib/ocaml/compiler-libs/topstart.cmo
 lib/ocaml/compiler-libs/topstart.cmt
+lib/ocaml/compiler-libs/topstart.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/topstart.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/topstart.o
+lib/ocaml/compiler-libs/topstart.mli
+lib/ocaml/compiler-libs/topstart.o
 lib/ocaml/compiler-libs/trace.cmi
 lib/ocaml/compiler-libs/trace.cmt
 lib/ocaml/compiler-libs/trace.cmti
@@ -1376,11 +1405,11 @@ lib/ocaml/compiler-libs/translprim.cmt
 lib/ocaml/compiler-libs/translprim.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/translprim.cmx
 lib/ocaml/compiler-libs/translprim.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmti
+lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmi
+lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmt
+lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/traverse_for_exported_symbols.mli
+lib/ocaml/compiler-libs/traverse_for_exported_symbols.mli
 lib/ocaml/compiler-libs/type_immediacy.cmi
 lib/ocaml/compiler-libs/type_immediacy.cmt
 lib/ocaml/compiler-libs/type_immediacy.cmti
@@ -1451,89 +1480,115 @@ lib/ocaml/compiler-libs/typetexp.cmt
 lib/ocaml/compiler-libs/typetexp.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typetexp.cmx
 lib/ocaml/compiler-libs/typetexp.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/un_anf.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/un_anf.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/un_anf.cmti
+lib/ocaml/compiler-libs/un_anf.cmi
+lib/ocaml/compiler-libs/un_anf.cmt
+lib/ocaml/compiler-libs/un_anf.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/un_anf.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/un_anf.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_closures.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_closures.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_closures.cmti
+lib/ocaml/compiler-libs/un_anf.mli
+lib/ocaml/compiler-libs/unbox_closures.cmi
+lib/ocaml/compiler-libs/unbox_closures.cmt
+lib/ocaml/compiler-libs/unbox_closures.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_closures.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_closures.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmti
+lib/ocaml/compiler-libs/unbox_closures.mli
+lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmi
+lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmt
+lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_free_vars_of_closures.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_specialised_args.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_specialised_args.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_specialised_args.cmti
+lib/ocaml/compiler-libs/unbox_free_vars_of_closures.mli
+lib/ocaml/compiler-libs/unbox_specialised_args.cmi
+lib/ocaml/compiler-libs/unbox_specialised_args.cmt
+lib/ocaml/compiler-libs/unbox_specialised_args.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_specialised_args.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unbox_specialised_args.mli
+lib/ocaml/compiler-libs/unbox_specialised_args.mli
+lib/ocaml/compiler-libs/unit_info.cmi
+lib/ocaml/compiler-libs/unit_info.cmt
+lib/ocaml/compiler-libs/unit_info.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/unit_info.cmx
+lib/ocaml/compiler-libs/unit_info.mli
 lib/ocaml/compiler-libs/untypeast.cmi
 lib/ocaml/compiler-libs/untypeast.cmt
 lib/ocaml/compiler-libs/untypeast.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/untypeast.cmx
 lib/ocaml/compiler-libs/untypeast.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/var_within_closure.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/var_within_closure.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/var_within_closure.cmti
+lib/ocaml/compiler-libs/value_rec_check.cmi
+lib/ocaml/compiler-libs/value_rec_check.cmt
+lib/ocaml/compiler-libs/value_rec_check.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/value_rec_check.cmx
+lib/ocaml/compiler-libs/value_rec_check.mli
+lib/ocaml/compiler-libs/value_rec_compiler.cmi
+lib/ocaml/compiler-libs/value_rec_compiler.cmt
+lib/ocaml/compiler-libs/value_rec_compiler.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/value_rec_compiler.cmx
+lib/ocaml/compiler-libs/value_rec_compiler.mli
+lib/ocaml/compiler-libs/value_rec_types.cmi
+lib/ocaml/compiler-libs/value_rec_types.cmti
+lib/ocaml/compiler-libs/value_rec_types.mli
+lib/ocaml/compiler-libs/var_within_closure.cmi
+lib/ocaml/compiler-libs/var_within_closure.cmt
+lib/ocaml/compiler-libs/var_within_closure.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/var_within_closure.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/var_within_closure.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/variable.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/variable.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/variable.cmti
+lib/ocaml/compiler-libs/var_within_closure.mli
+lib/ocaml/compiler-libs/variable.cmi
+lib/ocaml/compiler-libs/variable.cmt
+lib/ocaml/compiler-libs/variable.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/variable.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/variable.mli
+lib/ocaml/compiler-libs/variable.mli
 lib/ocaml/compiler-libs/warnings.cmi
 lib/ocaml/compiler-libs/warnings.cmt
 lib/ocaml/compiler-libs/warnings.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/warnings.cmx
 lib/ocaml/compiler-libs/warnings.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_ast.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_ast.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_ast.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_dsl.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_dsl.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_dsl.cmti
+lib/ocaml/compiler-libs/x86_ast.cmi
+lib/ocaml/compiler-libs/x86_ast.cmti
+lib/ocaml/compiler-libs/x86_ast.mli
+lib/ocaml/compiler-libs/x86_dsl.cmi
+lib/ocaml/compiler-libs/x86_dsl.cmt
+lib/ocaml/compiler-libs/x86_dsl.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_dsl.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_dsl.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_gas.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_gas.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_gas.cmti
+lib/ocaml/compiler-libs/x86_dsl.mli
+lib/ocaml/compiler-libs/x86_gas.cmi
+lib/ocaml/compiler-libs/x86_gas.cmt
+lib/ocaml/compiler-libs/x86_gas.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_gas.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_gas.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_masm.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_masm.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_masm.cmti
+lib/ocaml/compiler-libs/x86_gas.mli
+lib/ocaml/compiler-libs/x86_masm.cmi
+lib/ocaml/compiler-libs/x86_masm.cmt
+lib/ocaml/compiler-libs/x86_masm.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_masm.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_masm.mli
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_proc.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_proc.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_proc.cmti
+lib/ocaml/compiler-libs/x86_masm.mli
+lib/ocaml/compiler-libs/x86_proc.cmi
+lib/ocaml/compiler-libs/x86_proc.cmt
+lib/ocaml/compiler-libs/x86_proc.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_proc.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_proc.mli
+lib/ocaml/compiler-libs/x86_proc.mli
 lib/ocaml/complex.ml
 lib/ocaml/complex.mli
+lib/ocaml/condition.ml
+lib/ocaml/condition.mli
 lib/ocaml/digest.ml
 lib/ocaml/digest.mli
-${PLIST.ocaml-opt}lib/ocaml/dynlink.a
-lib/ocaml/dynlink.cma
-lib/ocaml/dynlink.cmi
-lib/ocaml/dynlink.cmti
-${PLIST.ocaml-opt}lib/ocaml/dynlink.cmx
-${PLIST.ocaml-opt}lib/ocaml/dynlink.cmxa
-lib/ocaml/dynlink.mli
-${PLIST.ocaml-opt}lib/ocaml/dynlink_common.cmx
-${PLIST.ocaml-opt}lib/ocaml/dynlink_compilerlibs.cmx
-${PLIST.ocaml-opt}lib/ocaml/dynlink_platform_intf.cmx
-${PLIST.ocaml-opt}lib/ocaml/dynlink_types.cmx
+lib/ocaml/domain.ml
+lib/ocaml/domain.mli
+lib/ocaml/dynarray.ml
+lib/ocaml/dynarray.mli
+lib/ocaml/dynlink/META
+lib/ocaml/dynlink/dynlink.a
+lib/ocaml/dynlink/dynlink.cma
+lib/ocaml/dynlink/dynlink.cmi
+lib/ocaml/dynlink/dynlink.cmti
+${PLIST.ocaml-opt}lib/ocaml/dynlink/dynlink.cmx
+lib/ocaml/dynlink/dynlink.cmxa
+lib/ocaml/dynlink/dynlink.mli
+${PLIST.ocaml-opt}lib/ocaml/dynlink/dynlink_common.cmx
+${PLIST.ocaml-opt}lib/ocaml/dynlink/dynlink_compilerlibs.cmx
+${PLIST.ocaml-opt}lib/ocaml/dynlink/dynlink_platform_intf.cmx
+${PLIST.ocaml-opt}lib/ocaml/dynlink/dynlink_types.cmx
+lib/ocaml/effect.ml
+lib/ocaml/effect.mli
 lib/ocaml/either.ml
 lib/ocaml/either.mli
 lib/ocaml/ephemeron.ml
 lib/ocaml/ephemeron.mli
-lib/ocaml/eventlog_metadata
 lib/ocaml/expunge
 lib/ocaml/filename.ml
 lib/ocaml/filename.mli
@@ -1545,8 +1600,6 @@ lib/ocaml/fun.ml
 lib/ocaml/fun.mli
 lib/ocaml/gc.ml
 lib/ocaml/gc.mli
-lib/ocaml/genlex.ml
-lib/ocaml/genlex.mli
 lib/ocaml/hashtbl.ml
 lib/ocaml/hashtbl.mli
 lib/ocaml/in_channel.ml
@@ -1562,20 +1615,25 @@ lib/ocaml/lazy.mli
 lib/ocaml/ld.conf
 lib/ocaml/lexing.ml
 lib/ocaml/lexing.mli
-${PLIST.ocaml-opt}lib/ocaml/libasmrun.a
-${PLIST.ocaml-opt}lib/ocaml/libasmrun_pic.a
-${PLIST.ocaml-opt}lib/ocaml/libasmrun_shared.so
-${PLIST.ocaml-opt}lib/ocaml/libasmrund.a
-${PLIST.ocaml-opt}lib/ocaml/libasmruni.a
+lib/ocaml/libasmrun.a
+lib/ocaml/libasmrun_pic.a
+lib/ocaml/libasmrun_shared.so
+lib/ocaml/libasmrund.a
+lib/ocaml/libasmruni.a
 lib/ocaml/libcamlrun.a
 lib/ocaml/libcamlrun_pic.a
 lib/ocaml/libcamlrun_shared.so
 lib/ocaml/libcamlrund.a
 lib/ocaml/libcamlruni.a
-lib/ocaml/libcamlstr.a
+lib/ocaml/libcamlruntime_eventsbyt.a
+lib/ocaml/libcamlruntime_eventsnat.a
+lib/ocaml/libcamlstrbyt.a
+lib/ocaml/libcamlstrnat.a
+lib/ocaml/libcomprmarsh.a
 lib/ocaml/libthreads.a
-${PLIST.ocaml-opt}lib/ocaml/libthreadsnat.a
-lib/ocaml/libunix.a
+lib/ocaml/libthreadsnat.a
+lib/ocaml/libunixbyt.a
+lib/ocaml/libunixnat.a
 lib/ocaml/list.ml
 lib/ocaml/list.mli
 lib/ocaml/listLabels.ml
@@ -1586,10 +1644,13 @@ lib/ocaml/marshal.ml
 lib/ocaml/marshal.mli
 lib/ocaml/moreLabels.ml
 lib/ocaml/moreLabels.mli
+lib/ocaml/mutex.ml
+lib/ocaml/mutex.mli
 lib/ocaml/nativeint.ml
 lib/ocaml/nativeint.mli
 lib/ocaml/obj.ml
 lib/ocaml/obj.mli
+lib/ocaml/ocamldoc/META
 lib/ocaml/ocamldoc/ocamldoc.hva
 lib/ocaml/ocamldoc/odoc.cmi
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc.cmx
@@ -1607,50 +1668,70 @@ lib/ocaml/ocamldoc/odoc_comments_global.cmi
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_comments_global.cmx
 lib/ocaml/ocamldoc/odoc_config.cmi
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_config.cmx
-lib/ocaml/ocamldoc/odoc_control.cmi
-${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_control.cmx
 lib/ocaml/ocamldoc/odoc_cross.cmi
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_cross.cmx
 lib/ocaml/ocamldoc/odoc_dag2html.cmi
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_dag2html.cmx
 lib/ocaml/ocamldoc/odoc_dep.cmi
+lib/ocaml/ocamldoc/odoc_dep.cmt
+lib/ocaml/ocamldoc/odoc_dep.cmti
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_dep.cmx
+lib/ocaml/ocamldoc/odoc_dep.mli
 lib/ocaml/ocamldoc/odoc_dot.cmi
+lib/ocaml/ocamldoc/odoc_dot.cmt
+lib/ocaml/ocamldoc/odoc_dot.cmti
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_dot.cmx
+lib/ocaml/ocamldoc/odoc_dot.mli
 lib/ocaml/ocamldoc/odoc_env.cmi
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_env.cmx
 lib/ocaml/ocamldoc/odoc_exception.cmi
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_exception.cmx
 lib/ocaml/ocamldoc/odoc_extension.cmi
+lib/ocaml/ocamldoc/odoc_extension.cmt
+lib/ocaml/ocamldoc/odoc_extension.cmti
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_extension.cmx
+lib/ocaml/ocamldoc/odoc_extension.mli
 lib/ocaml/ocamldoc/odoc_gen.cmi
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_gen.cmx
 lib/ocaml/ocamldoc/odoc_global.cmi
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_global.cmx
 lib/ocaml/ocamldoc/odoc_html.cmi
+lib/ocaml/ocamldoc/odoc_html.cmt
+lib/ocaml/ocamldoc/odoc_html.cmti
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_html.cmx
-${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_info.a
+lib/ocaml/ocamldoc/odoc_html.mli
+lib/ocaml/ocamldoc/odoc_info.a
 lib/ocaml/ocamldoc/odoc_info.cma
 lib/ocaml/ocamldoc/odoc_info.cmi
 lib/ocaml/ocamldoc/odoc_info.cmt
 lib/ocaml/ocamldoc/odoc_info.cmti
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_info.cmx
-${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_info.cmxa
+lib/ocaml/ocamldoc/odoc_info.cmxa
 lib/ocaml/ocamldoc/odoc_info.mli
-lib/ocaml/ocamldoc/odoc_inherit.cmi
-${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_inherit.cmx
 lib/ocaml/ocamldoc/odoc_latex.cmi
+lib/ocaml/ocamldoc/odoc_latex.cmt
+lib/ocaml/ocamldoc/odoc_latex.cmti
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_latex.cmx
+lib/ocaml/ocamldoc/odoc_latex.mli
 lib/ocaml/ocamldoc/odoc_latex_style.cmi
+lib/ocaml/ocamldoc/odoc_latex_style.cmt
+lib/ocaml/ocamldoc/odoc_latex_style.cmti
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_latex_style.cmx
+lib/ocaml/ocamldoc/odoc_latex_style.mli
 lib/ocaml/ocamldoc/odoc_lexer.cmi
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_lexer.cmx
 lib/ocaml/ocamldoc/odoc_man.cmi
+lib/ocaml/ocamldoc/odoc_man.cmt
+lib/ocaml/ocamldoc/odoc_man.cmti
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_man.cmx
+lib/ocaml/ocamldoc/odoc_man.mli
 lib/ocaml/ocamldoc/odoc_merge.cmi
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_merge.cmx
 lib/ocaml/ocamldoc/odoc_messages.cmi
+lib/ocaml/ocamldoc/odoc_messages.cmt
+lib/ocaml/ocamldoc/odoc_messages.cmti
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_messages.cmx
+lib/ocaml/ocamldoc/odoc_messages.mli
 lib/ocaml/ocamldoc/odoc_misc.cmi
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_misc.cmx
 lib/ocaml/ocamldoc/odoc_module.cmi
@@ -1658,9 +1739,15 @@ ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_module.cmx
 lib/ocaml/ocamldoc/odoc_name.cmi
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_name.cmx
 lib/ocaml/ocamldoc/odoc_ocamlhtml.cmi
+lib/ocaml/ocamldoc/odoc_ocamlhtml.cmt
+lib/ocaml/ocamldoc/odoc_ocamlhtml.cmti
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_ocamlhtml.cmx
+lib/ocaml/ocamldoc/odoc_ocamlhtml.mli
 lib/ocaml/ocamldoc/odoc_parameter.cmi
+lib/ocaml/ocamldoc/odoc_parameter.cmt
+lib/ocaml/ocamldoc/odoc_parameter.cmti
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_parameter.cmx
+lib/ocaml/ocamldoc/odoc_parameter.mli
 lib/ocaml/ocamldoc/odoc_parser.cmi
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_parser.cmx
 lib/ocaml/ocamldoc/odoc_print.cmi
@@ -1677,21 +1764,36 @@ lib/ocaml/ocamldoc/odoc_str.cmi
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_str.cmx
 lib/ocaml/ocamldoc/odoc_test.cmi
 lib/ocaml/ocamldoc/odoc_texi.cmi
+lib/ocaml/ocamldoc/odoc_texi.cmt
+lib/ocaml/ocamldoc/odoc_texi.cmti
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_texi.cmx
+lib/ocaml/ocamldoc/odoc_texi.mli
 lib/ocaml/ocamldoc/odoc_text.cmi
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_text.cmx
 lib/ocaml/ocamldoc/odoc_text_lexer.cmi
+lib/ocaml/ocamldoc/odoc_text_lexer.cmt
+lib/ocaml/ocamldoc/odoc_text_lexer.cmti
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_text_lexer.cmx
+lib/ocaml/ocamldoc/odoc_text_lexer.mli
 lib/ocaml/ocamldoc/odoc_text_parser.cmi
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_text_parser.cmx
 lib/ocaml/ocamldoc/odoc_to_text.cmi
+lib/ocaml/ocamldoc/odoc_to_text.cmt
+lib/ocaml/ocamldoc/odoc_to_text.cmti
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_to_text.cmx
+lib/ocaml/ocamldoc/odoc_to_text.mli
 lib/ocaml/ocamldoc/odoc_type.cmi
+lib/ocaml/ocamldoc/odoc_type.cmt
+lib/ocaml/ocamldoc/odoc_type.cmti
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_type.cmx
+lib/ocaml/ocamldoc/odoc_type.mli
 lib/ocaml/ocamldoc/odoc_types.cmi
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_types.cmx
 lib/ocaml/ocamldoc/odoc_value.cmi
+lib/ocaml/ocamldoc/odoc_value.cmt
+lib/ocaml/ocamldoc/odoc_value.cmti
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_value.cmx
+lib/ocaml/ocamldoc/odoc_value.mli
 lib/ocaml/oo.ml
 lib/ocaml/oo.mli
 lib/ocaml/option.ml
@@ -1700,25 +1802,36 @@ lib/ocaml/out_channel.ml
 lib/ocaml/out_channel.mli
 lib/ocaml/parsing.ml
 lib/ocaml/parsing.mli
-lib/ocaml/pervasives.ml
 lib/ocaml/printexc.ml
 lib/ocaml/printexc.mli
 lib/ocaml/printf.ml
 lib/ocaml/printf.mli
-lib/ocaml/profiling.cmi
-lib/ocaml/profiling.cmo
-lib/ocaml/profiling.cmt
-lib/ocaml/profiling.cmti
-${PLIST.ocaml-opt}lib/ocaml/profiling.cmx
-${PLIST.ocaml-opt}lib/ocaml/profiling.o
+lib/ocaml/profiling/profiling.cmi
+lib/ocaml/profiling/profiling.cmo
+lib/ocaml/profiling/profiling.cmt
+lib/ocaml/profiling/profiling.cmti
+${PLIST.ocaml-opt}lib/ocaml/profiling/profiling.cmx
+lib/ocaml/profiling/profiling.o
 lib/ocaml/queue.ml
 lib/ocaml/queue.mli
 lib/ocaml/random.ml
 lib/ocaml/random.mli
 lib/ocaml/result.ml
 lib/ocaml/result.mli
+lib/ocaml/runtime-launch-info
+lib/ocaml/runtime_events/META
+lib/ocaml/runtime_events/runtime_events.a
+lib/ocaml/runtime_events/runtime_events.cma
+lib/ocaml/runtime_events/runtime_events.cmi
+lib/ocaml/runtime_events/runtime_events.cmti
+${PLIST.ocaml-opt}lib/ocaml/runtime_events/runtime_events.cmx
+lib/ocaml/runtime_events/runtime_events.cmxa
+lib/ocaml/runtime_events/runtime_events.cmxs
+lib/ocaml/runtime_events/runtime_events.mli
 lib/ocaml/scanf.ml
 lib/ocaml/scanf.mli
+lib/ocaml/semaphore.ml
+lib/ocaml/semaphore.mli
 lib/ocaml/seq.ml
 lib/ocaml/seq.mli
 lib/ocaml/set.ml
@@ -1730,18 +1843,21 @@ lib/ocaml/stdLabels.mli
 lib/ocaml/std_exit.cmi
 lib/ocaml/std_exit.cmo
 lib/ocaml/std_exit.cmt
+lib/ocaml/std_exit.cmti
 ${PLIST.ocaml-opt}lib/ocaml/std_exit.cmx
 lib/ocaml/std_exit.ml
-${PLIST.ocaml-opt}lib/ocaml/std_exit.o
-${PLIST.ocaml-opt}lib/ocaml/stdlib.a
+lib/ocaml/std_exit.mli
+lib/ocaml/std_exit.o
+lib/ocaml/stdlib.a
 lib/ocaml/stdlib.cma
 lib/ocaml/stdlib.cmi
 lib/ocaml/stdlib.cmt
 lib/ocaml/stdlib.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib.cmx
-${PLIST.ocaml-opt}lib/ocaml/stdlib.cmxa
+lib/ocaml/stdlib.cmxa
 lib/ocaml/stdlib.ml
 lib/ocaml/stdlib.mli
+lib/ocaml/stdlib/META
 lib/ocaml/stdlib__Arg.cmi
 lib/ocaml/stdlib__Arg.cmt
 lib/ocaml/stdlib__Arg.cmti
@@ -1790,10 +1906,26 @@ lib/ocaml/stdlib__Complex.cmi
 lib/ocaml/stdlib__Complex.cmt
 lib/ocaml/stdlib__Complex.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__Complex.cmx
+lib/ocaml/stdlib__Condition.cmi
+lib/ocaml/stdlib__Condition.cmt
+lib/ocaml/stdlib__Condition.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Condition.cmx
 lib/ocaml/stdlib__Digest.cmi
 lib/ocaml/stdlib__Digest.cmt
 lib/ocaml/stdlib__Digest.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__Digest.cmx
+lib/ocaml/stdlib__Domain.cmi
+lib/ocaml/stdlib__Domain.cmt
+lib/ocaml/stdlib__Domain.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Domain.cmx
+lib/ocaml/stdlib__Dynarray.cmi
+lib/ocaml/stdlib__Dynarray.cmt
+lib/ocaml/stdlib__Dynarray.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Dynarray.cmx
+lib/ocaml/stdlib__Effect.cmi
+lib/ocaml/stdlib__Effect.cmt
+lib/ocaml/stdlib__Effect.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Effect.cmx
 lib/ocaml/stdlib__Either.cmi
 lib/ocaml/stdlib__Either.cmt
 lib/ocaml/stdlib__Either.cmti
@@ -1822,10 +1954,6 @@ lib/ocaml/stdlib__Gc.cmi
 lib/ocaml/stdlib__Gc.cmt
 lib/ocaml/stdlib__Gc.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__Gc.cmx
-lib/ocaml/stdlib__Genlex.cmi
-lib/ocaml/stdlib__Genlex.cmt
-lib/ocaml/stdlib__Genlex.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__Genlex.cmx
 lib/ocaml/stdlib__Hashtbl.cmi
 lib/ocaml/stdlib__Hashtbl.cmt
 lib/ocaml/stdlib__Hashtbl.cmti
@@ -1874,6 +2002,10 @@ lib/ocaml/stdlib__MoreLabels.cmi
 lib/ocaml/stdlib__MoreLabels.cmt
 lib/ocaml/stdlib__MoreLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__MoreLabels.cmx
+lib/ocaml/stdlib__Mutex.cmi
+lib/ocaml/stdlib__Mutex.cmt
+lib/ocaml/stdlib__Mutex.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Mutex.cmx
 lib/ocaml/stdlib__Nativeint.cmi
 lib/ocaml/stdlib__Nativeint.cmt
 lib/ocaml/stdlib__Nativeint.cmti
@@ -1898,9 +2030,6 @@ lib/ocaml/stdlib__Parsing.cmi
 lib/ocaml/stdlib__Parsing.cmt
 lib/ocaml/stdlib__Parsing.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__Parsing.cmx
-lib/ocaml/stdlib__Pervasives.cmi
-lib/ocaml/stdlib__Pervasives.cmt
-${PLIST.ocaml-opt}lib/ocaml/stdlib__Pervasives.cmx
 lib/ocaml/stdlib__Printexc.cmi
 lib/ocaml/stdlib__Printexc.cmt
 lib/ocaml/stdlib__Printexc.cmti
@@ -1925,6 +2054,10 @@ lib/ocaml/stdlib__Scanf.cmi
 lib/ocaml/stdlib__Scanf.cmt
 lib/ocaml/stdlib__Scanf.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__Scanf.cmx
+lib/ocaml/stdlib__Semaphore.cmi
+lib/ocaml/stdlib__Semaphore.cmt
+lib/ocaml/stdlib__Semaphore.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Semaphore.cmx
 lib/ocaml/stdlib__Seq.cmi
 lib/ocaml/stdlib__Seq.cmt
 lib/ocaml/stdlib__Seq.cmti
@@ -1941,10 +2074,6 @@ lib/ocaml/stdlib__StdLabels.cmi
 lib/ocaml/stdlib__StdLabels.cmt
 lib/ocaml/stdlib__StdLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__StdLabels.cmx
-lib/ocaml/stdlib__Stream.cmi
-lib/ocaml/stdlib__Stream.cmt
-lib/ocaml/stdlib__Stream.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__Stream.cmx
 lib/ocaml/stdlib__String.cmi
 lib/ocaml/stdlib__String.cmt
 lib/ocaml/stdlib__String.cmti
@@ -1957,6 +2086,10 @@ lib/ocaml/stdlib__Sys.cmi
 lib/ocaml/stdlib__Sys.cmt
 lib/ocaml/stdlib__Sys.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__Sys.cmx
+lib/ocaml/stdlib__Type.cmi
+lib/ocaml/stdlib__Type.cmt
+lib/ocaml/stdlib__Type.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Type.cmx
 lib/ocaml/stdlib__Uchar.cmi
 lib/ocaml/stdlib__Uchar.cmt
 lib/ocaml/stdlib__Uchar.cmti
@@ -1969,72 +2102,60 @@ 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-opt}lib/ocaml/str.a
-lib/ocaml/str.cma
-lib/ocaml/str.cmi
-lib/ocaml/str.cmti
-${PLIST.ocaml-opt}lib/ocaml/str.cmx
-${PLIST.ocaml-opt}lib/ocaml/str.cmxa
-${PLIST.ocaml-opt}lib/ocaml/str.cmxs
-lib/ocaml/str.mli
-lib/ocaml/stream.ml
-lib/ocaml/stream.mli
+lib/ocaml/str/META
+lib/ocaml/str/str.a
+lib/ocaml/str/str.cma
+lib/ocaml/str/str.cmi
+lib/ocaml/str/str.cmti
+${PLIST.ocaml-opt}lib/ocaml/str/str.cmx
+lib/ocaml/str/str.cmxa
+lib/ocaml/str/str.cmxs
+lib/ocaml/str/str.mli
 lib/ocaml/string.ml
 lib/ocaml/string.mli
 lib/ocaml/stringLabels.ml
 lib/ocaml/stringLabels.mli
-lib/ocaml/stublibs/dllcamlstr.so
+lib/ocaml/stublibs/dllcamlruntime_eventsbyt.so
+lib/ocaml/stublibs/dllcamlruntime_eventsnat.so
+lib/ocaml/stublibs/dllcamlstrbyt.so
+lib/ocaml/stublibs/dllcamlstrnat.so
 lib/ocaml/stublibs/dllthreads.so
-lib/ocaml/stublibs/dllunix.so
+lib/ocaml/stublibs/dllunixbyt.so
+lib/ocaml/stublibs/dllunixnat.so
 lib/ocaml/sys.ml
+lib/ocaml/sys.ml.in
 lib/ocaml/sys.mli
-lib/ocaml/threads/condition.cmi
-lib/ocaml/threads/condition.cmti
-${PLIST.ocaml-opt}lib/ocaml/threads/condition.cmx
-lib/ocaml/threads/condition.mli
+lib/ocaml/threads/META
 lib/ocaml/threads/event.cmi
 lib/ocaml/threads/event.cmti
 ${PLIST.ocaml-opt}lib/ocaml/threads/event.cmx
 lib/ocaml/threads/event.mli
-lib/ocaml/threads/mutex.cmi
-lib/ocaml/threads/mutex.cmti
-${PLIST.ocaml-opt}lib/ocaml/threads/mutex.cmx
-lib/ocaml/threads/mutex.mli
-lib/ocaml/threads/semaphore.cmi
-lib/ocaml/threads/semaphore.cmti
-${PLIST.ocaml-opt}lib/ocaml/threads/semaphore.cmx
-lib/ocaml/threads/semaphore.mli
 lib/ocaml/threads/thread.cmi
 lib/ocaml/threads/thread.cmti
 ${PLIST.ocaml-opt}lib/ocaml/threads/thread.cmx
 lib/ocaml/threads/thread.mli
-lib/ocaml/threads/threadUnix.cmi
-lib/ocaml/threads/threadUnix.cmti
-${PLIST.ocaml-opt}lib/ocaml/threads/threadUnix.cmx
-lib/ocaml/threads/threadUnix.mli
-${PLIST.ocaml-opt}lib/ocaml/threads/threads.a
+lib/ocaml/threads/threads.a
 lib/ocaml/threads/threads.cma
-${PLIST.ocaml-opt}lib/ocaml/threads/threads.cmxa
-lib/ocaml/topdirs.cmi
-lib/ocaml/topdirs.cmt
-lib/ocaml/topdirs.cmti
-lib/ocaml/topdirs.mli
+lib/ocaml/threads/threads.cmxa
+lib/ocaml/type.ml
+lib/ocaml/type.mli
 lib/ocaml/uchar.ml
 lib/ocaml/uchar.mli
 lib/ocaml/unit.ml
 lib/ocaml/unit.mli
-${PLIST.ocaml-opt}lib/ocaml/unix.a
-lib/ocaml/unix.cma
-lib/ocaml/unix.cmi
-lib/ocaml/unix.cmti
-${PLIST.ocaml-opt}lib/ocaml/unix.cmx
-${PLIST.ocaml-opt}lib/ocaml/unix.cmxa
-${PLIST.ocaml-opt}lib/ocaml/unix.cmxs
-lib/ocaml/unix.mli
-lib/ocaml/unixLabels.cmi
-lib/ocaml/unixLabels.cmti
-${PLIST.ocaml-opt}lib/ocaml/unixLabels.cmx
-lib/ocaml/unixLabels.mli
+lib/ocaml/unix/META
+lib/ocaml/unix/unix.a
+lib/ocaml/unix/unix.cma
+lib/ocaml/unix/unix.cmi
+lib/ocaml/unix/unix.cmti
+${PLIST.ocaml-opt}lib/ocaml/unix/unix.cmx
+lib/ocaml/unix/unix.cmxa
+lib/ocaml/unix/unix.cmxs
+lib/ocaml/unix/unix.mli
+lib/ocaml/unix/unixLabels.cmi
+lib/ocaml/unix/unixLabels.cmti
+${PLIST.ocaml-opt}lib/ocaml/unix/unixLabels.cmx
+lib/ocaml/unix/unixLabels.mli
 lib/ocaml/weak.ml
 lib/ocaml/weak.mli
 man/man1/ocaml.1
@@ -2106,7 +2227,6 @@ man/man3/Builtin_attributes.3
 man/man3/Bytes.3
 man/man3/BytesLabels.3
 man/man3/Callback.3
-man/man3/CamlinternalAtomic.3
 man/man3/CamlinternalFormat.3
 man/man3/CamlinternalFormatBasics.3
 man/man3/CamlinternalLazy.3
@@ -2155,8 +2275,11 @@ man/man3/Clflags.Float_arg_helper.3
 man/man3/Clflags.Int_arg_helper.3
 man/man3/Compiler_libs.3
 man/man3/Complex.3
+man/man3/Compression.3
 man/man3/Condition.3
 man/man3/Config.3
+man/man3/Config_boot.3
+man/man3/Config_main.3
 man/man3/Consistbl.3
 man/man3/Consistbl.Make.3
 man/man3/Depend.3
@@ -2174,14 +2297,23 @@ man/man3/Diffing_with_keys.Define.3
 man/man3/Diffing_with_keys.Define.Parameters.3
 man/man3/Diffing_with_keys.Define.Simple.3
 man/man3/Digest.3
+man/man3/Digest.BLAKE128.3
+man/man3/Digest.BLAKE256.3
+man/man3/Digest.BLAKE512.3
+man/man3/Digest.MD5.3
+man/man3/Digest.S.3
 man/man3/Docstrings.3
 man/man3/Docstrings.WithMenhir.3
+man/man3/Domain.3
+man/man3/Domain.DLS.3
 man/man3/Domainstate.3
+man/man3/Dynarray.3
 man/man3/Dynlink.3
+man/man3/Effect.3
+man/man3/Effect.Deep.3
+man/man3/Effect.Shallow.3
 man/man3/Either.3
 man/man3/Ephemeron.3
-man/man3/Ephemeron.GenHashTable.3
-man/man3/Ephemeron.GenHashTable.MakeSeeded.3
 man/man3/Ephemeron.K1.3
 man/man3/Ephemeron.K1.Bucket.3
 man/man3/Ephemeron.K1.Make.3
@@ -2206,7 +2338,6 @@ man/man3/Format_tutorial.3
 man/man3/Fun.3
 man/man3/Gc.3
 man/man3/Gc.Memprof.3
-man/man3/Genlex.3
 man/man3/Hashtbl.3
 man/man3/Hashtbl.HashedType.3
 man/man3/Hashtbl.Make.3
@@ -2254,7 +2385,6 @@ man/man3/Misc.3
 man/man3/Misc.Color.3
 man/man3/Misc.Error_style.3
 man/man3/Misc.Int_literal_converter.3
-man/man3/Misc.LongString.3
 man/man3/Misc.Magic_number.3
 man/man3/Misc.Stdlib.3
 man/man3/Misc.Stdlib.Array.3
@@ -2264,6 +2394,7 @@ man/man3/Misc.Stdlib.String.3
 man/man3/Misc.Stdlib.String.Map.3
 man/man3/Misc.Stdlib.String.Set.3
 man/man3/Misc.Stdlib.String.Tbl.3
+man/man3/Misc.Style.3
 man/man3/MoreLabels.3
 man/man3/MoreLabels.Hashtbl.3
 man/man3/MoreLabels.Hashtbl.HashedType.3
@@ -2288,7 +2419,6 @@ man/man3/Numbers.Int.3
 man/man3/Numbers.Int16.3
 man/man3/Numbers.Int8.3
 man/man3/Obj.3
-man/man3/Obj.Closure.3
 man/man3/Obj.Ephemeron.3
 man/man3/Obj.Extension_constructor.3
 man/man3/Ocaml_operators.3
@@ -2312,6 +2442,11 @@ man/man3/Queue.3
 man/man3/Random.3
 man/man3/Random.State.3
 man/man3/Result.3
+man/man3/Runtime_events.3
+man/man3/Runtime_events.Callbacks.3
+man/man3/Runtime_events.Timestamp.3
+man/man3/Runtime_events.Type.3
+man/man3/Runtime_events.User.3
 man/man3/Scanf.3
 man/man3/Scanf.Scanning.3
 man/man3/Semaphore.3
@@ -2341,7 +2476,11 @@ man/man3/Stdlib.BytesLabels.3
 man/man3/Stdlib.Callback.3
 man/man3/Stdlib.Char.3
 man/man3/Stdlib.Complex.3
+man/man3/Stdlib.Condition.3
 man/man3/Stdlib.Digest.3
+man/man3/Stdlib.Domain.3
+man/man3/Stdlib.Dynarray.3
+man/man3/Stdlib.Effect.3
 man/man3/Stdlib.Either.3
 man/man3/Stdlib.Ephemeron.3
 man/man3/Stdlib.Filename.3
@@ -2349,7 +2488,6 @@ man/man3/Stdlib.Float.3
 man/man3/Stdlib.Format.3
 man/man3/Stdlib.Fun.3
 man/man3/Stdlib.Gc.3
-man/man3/Stdlib.Genlex.3
 man/man3/Stdlib.Hashtbl.3
 man/man3/Stdlib.In_channel.3
 man/man3/Stdlib.Int.3
@@ -2363,32 +2501,32 @@ man/man3/Stdlib.ListLabels.3
 man/man3/Stdlib.Map.3
 man/man3/Stdlib.Marshal.3
 man/man3/Stdlib.MoreLabels.3
+man/man3/Stdlib.Mutex.3
 man/man3/Stdlib.Nativeint.3
 man/man3/Stdlib.Obj.3
 man/man3/Stdlib.Oo.3
 man/man3/Stdlib.Option.3
 man/man3/Stdlib.Out_channel.3
 man/man3/Stdlib.Parsing.3
-man/man3/Stdlib.Pervasives.3
 man/man3/Stdlib.Printexc.3
 man/man3/Stdlib.Printf.3
 man/man3/Stdlib.Queue.3
 man/man3/Stdlib.Random.3
 man/man3/Stdlib.Result.3
 man/man3/Stdlib.Scanf.3
+man/man3/Stdlib.Semaphore.3
 man/man3/Stdlib.Seq.3
 man/man3/Stdlib.Set.3
 man/man3/Stdlib.Stack.3
 man/man3/Stdlib.StdLabels.3
-man/man3/Stdlib.Stream.3
 man/man3/Stdlib.String.3
 man/man3/Stdlib.StringLabels.3
 man/man3/Stdlib.Sys.3
+man/man3/Stdlib.Type.3
 man/man3/Stdlib.Uchar.3
 man/man3/Stdlib.Unit.3
 man/man3/Stdlib.Weak.3
 man/man3/Str.3
-man/man3/Stream.3
 man/man3/String.3
 man/man3/StringLabels.3
 man/man3/Strongly_connected_components.3
@@ -2404,9 +2542,12 @@ man/man3/Sys.Immediate64.Non_immediate.3
 man/man3/Targetint.3
 man/man3/Terminfo.3
 man/man3/Thread.3
-man/man3/ThreadUnix.3
+man/man3/Type.3
+man/man3/Type.Id.3
 man/man3/Uchar.3
 man/man3/Unit.3
+man/man3/Unit_info.3
+man/man3/Unit_info.Artifact.3
 man/man3/Unix.3
 man/man3/Unix.LargeFile.3
 man/man3/UnixLabels.3
diff --git a/ocaml/buildlink3.mk b/ocaml/buildlink3.mk
index 97dd047322..33f8b7ff5b 100644
--- a/ocaml/buildlink3.mk
+++ b/ocaml/buildlink3.mk
@@ -6,8 +6,8 @@ BUILDLINK_TREE+=	ocaml
 .if !defined(OCAML_BUILDLINK3_MK)
 OCAML_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml+=	ocaml>4.15.9
-BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>4.15.9
+BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=4.14.0
+BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=4.14.0
 BUILDLINK_PKGSRCDIR.ocaml?=	../../lang/ocaml
 #BUILDLINK_DEPMETHOD.ocaml?=	build
 
diff --git a/ocaml/distinfo b/ocaml/distinfo
index a8b36c4a3e..491f3fd756 100644
--- a/ocaml/distinfo
+++ b/ocaml/distinfo
@@ -1,23 +1,5 @@
-$NetBSD: distinfo,v 1.145 2022/05/24 18:25:38 jaapb Exp $
+$NetBSD: distinfo,v 1.146 2023/04/09 07:27:48 wiz Exp $
 
-BLAKE2s (ocaml-5.0.0~beta1.tar.gz) = 4eed36e7838ce27aafb45f4b5199608a098e4daab6528aab9822472c5d2d307f
-SHA512 (ocaml-5.0.0~beta1.tar.gz) = e0a9a1a61e77ab5ef22f0733410f1d3ad9119c14e5507ca26a3584bed9b74bb13ae07369701a521a4926fde65e0b8d202eb4581f998f51dee1bf87db07f97499
-Size (ocaml-5.0.0~beta1.tar.gz) = 5648536 bytes
-SHA1 (patch-Makefile) = 15bb45ef45add0bd082f1b47050bc38456aeb5bd
-SHA1 (patch-Makefile.build_config.in) = cbbe5dfd7ebf3302676cc47e35a7bd5177404108
-SHA1 (patch-api__docgen_ocamldoc_Makefile) = 075419e3534abc0dd06b19be599c42ec18f3bd75
-SHA1 (patch-check-linker-version_sh) = c90242556207242ac58499d7f42519a10aedcca4
-SHA1 (patch-configure) = 36ddb6f19ce7564889dc48ee290904dce00b04ec
-SHA1 (patch-lex_Makefile) = ecfb05c919a12ddf4be30c810b9a245d295eb113
-SHA1 (patch-man_Makefile) = 3d55fe5127758566f81a1b4e55e66c6ae3a848f1
-SHA1 (patch-ocamldoc_Makefile) = 3c2460a03c148789b2f187eee6678858ecb39ead
-SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b
-SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 0a91ea3a5d1b89b9755ea41c29f85c34e4025600
-SHA1 (patch-otherlibs_systhreads_Makefile) = ba4668460e6300b10f1d57fa0e46c0c39b2ff98f
-SHA1 (patch-otherlibs_systhreads_st__stubs.c) = 65adba4249a6ef871c3f44df2fc0252a664d3a15
-SHA1 (patch-otherlibs_unix_Makefile) = 2c58be92b9dfab1abace62a0f4c168da72226c9f
-SHA1 (patch-runtime_floats.c) = 584a30d31c7b7da4f8387dc58b90fa1a8078f723
-SHA1 (patch-runtime_sak.c) = 62a0946419b96033497a4a12105bbd9b4ef3aba6
-SHA1 (patch-testsuite_tests_lib-systhreads_testyield.ml) = 0f6d35e030de168c6f4aeb126055065ed47878aa
-SHA1 (patch-tools_Makefile) = d181dd3ed3f3eb270451fb5bd15317cfb9e6fb11
-SHA1 (patch-tools_ocamlmklib.ml) = dad1d55e0b0cef61a76844b45fcde83277f4a087
+BLAKE2s (ocaml-5.2.0.tar.gz) = 0b463dc4ad141f016f5641826942a64f94362f06a92e7a9f54b0cbbc0dab78c4
+SHA512 (ocaml-5.2.0.tar.gz) = 78115690186c13c1f2480e4812a9fe34cce2c28bf8a89d5c9810bca0391f930cecd9cee2b53daca8a32da1815628b33be68f3948f1ad03fa50b72b14e3ea84f2
+Size (ocaml-5.2.0.tar.gz) = 6047633 bytes
diff --git a/ocaml/hacks.mk b/ocaml/hacks.mk
index 6c7afc3b60..a2a731f0e4 100644
--- a/ocaml/hacks.mk
+++ b/ocaml/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.9 2020/12/09 10:33:04 jaapb Exp $
+# $NetBSD: hacks.mk,v 1.10 2023/04/09 07:28:27 wiz Exp $
 
 .if !defined(OCAML_HACKS_MK)
 OCAML_HACKS_MK=	defined
@@ -14,7 +14,7 @@ OCAML_HACKS_MK=	defined
 ### into utils/config.ml and will later be used by the OCaml compiler
 ### itself.
 ###
-.if !empty(MACHINE_PLATFORM:MDarwin-[0-9].*-*)
+.if ${MACHINE_PLATFORM:MDarwin-[0-9].*-*}
 PKG_HACKS+=				no_compact_unwind
 SUBST_CLASSES+=				no_compact_unwind
 SUBST_MESSAGE.no_compact_unwind=	Removing -no_compact_unwind from linker options
diff --git a/ocaml/native.mk b/ocaml/native.mk
index b462411b5e..5c6ccb8b5e 100644
--- a/ocaml/native.mk
+++ b/ocaml/native.mk
@@ -1,4 +1,4 @@
-# $NetBSD: native.mk,v 1.1 2022/05/24 18:25:38 jaapb Exp $
+# $NetBSD: native.mk,v 1.2 2023/04/09 07:28:27 wiz Exp $
 #
 # This Makefile fragment handles the native code compiler options for OCaml.
 # It is used by ocaml.mk and the lang/ocaml package.
@@ -25,7 +25,7 @@ _DEF_VARS.ocaml=	\
 
 # Default value of OCAML_USE_OPT_COMPILER
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-     !empty(MACHINE_ARCH:M*arm*) || (${MACHINE_ARCH} == "aarch64") || \
+     ${MACHINE_ARCH:M*arm*} || (${MACHINE_ARCH} == "aarch64") || \
      (${MACHINE_ARCH} == "aarch64eb") || (${MACHINE_ARCH} == "x86_64")
 OCAML_USE_OPT_COMPILER?=	yes
 .else
diff --git a/ocaml/ocaml.mk b/ocaml/ocaml.mk
index 89cbf7f694..092abdcf55 100644
--- a/ocaml/ocaml.mk
+++ b/ocaml/ocaml.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ocaml.mk,v 1.1 2022/05/24 18:25:38 jaapb Exp $
+# $NetBSD: ocaml.mk,v 1.2 2023/04/09 07:28:27 wiz Exp $
 #
 # This Makefile fragment handles the common variables used by OCaml packages.
 # It should be included by every package that uses OCaml.
@@ -109,11 +109,11 @@ HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--destdir "${DESTDIR}"
 CONFIGURE_ARGS+=	--prefix "${PREFIX}"
 # Force use of native code compiler according to setting
-.if ${OCAML_USE_OPT_COMPILER} == "yes"
+.  if ${OCAML_USE_OPT_COMPILER} == "yes"
 CONFIGURE_ARGS+=	--override is_native true
-.else
+.  else
 CONFIGURE_ARGS+=	--override is_native false
-.endif
+.  endif
 .endif
 
 # Configure stuff for DUNE
@@ -169,14 +169,14 @@ OCAML_FINDLIB_REGISTER?=	yes
 .if ${OCAML_USE_OASIS} == "yes"
 # OASIS uses ocamlbuild
 .include "../../devel/ocamlbuild/buildlink3.mk"
-.if ${OCAML_USE_OASIS_DYNRUN} == "yes"
+.  if ${OCAML_USE_OASIS_DYNRUN} == "yes"
 pre-configure:
 	${RUN} cd ${WRKSRC} && ocamlfind ocamlc -linkpkg -package oasis.dynrun -o setup setup.ml && ${RM} setup.cmo setup.cmi
 
 OASIS_EXEC=	./setup
-.else
+.  else
 OASIS_EXEC=	ocaml setup.ml
-.endif
+.  endif
 
 # Redefine configure target
 do-configure:
@@ -233,17 +233,17 @@ do-install:
 .if ${OCAML_USE_DUNE} == "yes"
 
 do-build:
-.if !empty(DUNE_BUILD_PACKAGES)
+.  if !empty(DUNE_BUILD_PACKAGES)
 	${RUN} ${_ULIMIT_CMD} \
 		cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		dune build -j ${MAKE_JOBS:U1} \
 		${DUNE_BUILD_FLAGS} -p ${DUNE_BUILD_PACKAGES:ts,} \
 		${DUNE_BUILD_TARGETS}
-.else
+.  else
 	${RUN} ${_ULIMIT_CMD} \
 		cd ${WRKSRC} && dune build --profile release -j ${MAKE_JOBS:U1} \
 		${DUNE_BUILD_FLAGS} ${DUNE_BUILD_TARGETS}
-.endif
+.  endif
 
 .endif # ${OCAML_USE_DUNE} == "yes"
 
diff --git a/ocaml/options.mk b/ocaml/options.mk
index 6c46b4392a..e503db5d34 100644
--- a/ocaml/options.mk
+++ b/ocaml/options.mk
@@ -1,20 +1,25 @@
 # $NetBSD: options.mk,v 1.6 2022/05/24 18:25:38 jaapb Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ocaml
-PKG_SUPPORTED_OPTIONS=	pic flambda
-PKG_SUGGESTED_OPTIONS=	pic
+PKG_SUPPORTED_OPTIONS=	test
+PKG_SUGGESTED_OPTIONS=	test
 
-.include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mpic)
-CONFIGURE_ARGS+=	--with-pic
-.else
-CONFIGURE_ARGS+=	--without-pic
-.endif
-
-.if !empty(PKG_OPTIONS:Mflambda)
-CONFIGURE_ARGS+=	--enable-flambda
-.else
-CONFIGURE_ARGS+=	--disable-flambda
+.if !empty(PKG_OPTIONS:Mtest)
+CONFIGURE_ARGS+=	--enable-ocamltest
+# test status as of 5.2.0
+# List of failed tests:
+#    tests/lib-bigarray-2/'bigarrfml.ml' with line 19 (script) PKGSRC-WARNING
+#    tests/lib-bigarray-2/'bigarrfml.ml' with line 9 (script) PKGSRC-WARNING
+#    tests/lib-systhreads/'testyield.ml' with line 6 (bytecode) Timeout expired, killing all child processes
+#    tests/lib-systhreads/'testyield.ml' with line 8 (native) Timeout expired, killing all child processes
+#
+#Summary:
+#  3538 tests passed
+#    82 tests skipped
+#     4 tests failed
+#   148 tests not started (parent test skipped or failed)
+#     0 unexpected errors
+#  3772 tests considered
 .endif
diff --git a/ocaml/patches/patch-Makefile b/ocaml/patches/patch-Makefile
deleted file mode 100644
index d1e1819ed9..0000000000
--- a/ocaml/patches/patch-Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD$
-
-Use BSD_INSTALL_* instead of mkdir
-Honor LDFLAGS
-
---- Makefile.orig	2022-10-12 13:53:12.000000000 +0000
-+++ Makefile
-@@ -50,7 +50,7 @@ COMPFLAGS=-strict-sequence -principal -a
-           -w +a-4-9-40-41-42-44-45-48-66-70 \
-           -warn-error +a \
-           -bin-annot -safe-string -strict-formats $(INCLUDES)
--LINKFLAGS=
-+LINKFLAGS= -cclib "$(LDFLAGS)"
- 
- ifeq "$(strip $(NATDYNLINKOPTS))" ""
- OCAML_NATDYNLINKOPTS=
-@@ -922,7 +922,7 @@ endif # ifneq "$(COMPUTE_DEPS)" "false"
- endef
- 
- $(DEPDIR)/runtime:
--	$(MKDIR) $@
-+	$(BSD_INSTALL_LIB_DIR) $@
- 
- runtime_OBJECT_TYPES = % %.b %.bd %.bi %.bpic
- ifneq "$(NATIVE_COMPILER)" "false"
-@@ -1014,7 +1014,7 @@ runtime: $(addprefix stdlib/flexdll/, $(
- stdlib/flexdll/flexdll%.$(O): $(FLEXDLL_SOURCES)/flexdll%.$(O) | stdlib/flexdll
- 	cp $< $@
- stdlib/flexdll:
--	$(MKDIR) $@
-+	$(BSD_INSTALL_LIB_DIR) $@
- endif
- 
- .PHONY: makeruntime
-@@ -1419,12 +1419,12 @@ distclean: clean
- # Installation
- .PHONY: install
- install:
--	$(MKDIR) "$(INSTALL_BINDIR)"
--	$(MKDIR) "$(INSTALL_LIBDIR)"
--	$(MKDIR) "$(INSTALL_STUBLIBDIR)"
--	$(MKDIR) "$(INSTALL_COMPLIBDIR)"
--	$(MKDIR) "$(INSTALL_DOCDIR)"
--	$(MKDIR) "$(INSTALL_INCDIR)"
-+	$(BSD_INSTALL_PROGRAM_DIR) "$(INSTALL_BINDIR)"
-+	$(BSD_INSTALL_LIB_DIR) "$(INSTALL_LIBDIR)"
-+	$(BSD_INSTALL_LIB_DIR) "$(INSTALL_STUBLIBDIR)"
-+	$(BSD_INSTALL_LIB_DIR) "$(INSTALL_COMPLIBDIR)"
-+	$(BSD_INSTALL_DATA_DIR) "$(INSTALL_DOCDIR)"
-+	$(BSD_INSTALL_DATA_DIR) "$(INSTALL_INCDIR)"
- 	$(INSTALL_PROG) $(runtime_PROGRAMS) "$(INSTALL_BINDIR)"
- 	$(INSTALL_DATA) $(runtime_BYTECODE_STATIC_LIBRARIES) \
- 	  "$(INSTALL_LIBDIR)"
-@@ -1507,7 +1507,7 @@ ifeq "$(INSTALL_BYTECODE_PROGRAMS)" "tru
- 	$(INSTALL_PROG) \
- 	  boot/flexlink.byte$(EXE) "$(INSTALL_BINDIR)/flexlink.byte$(EXE)"
- endif # ifeq "$(INSTALL_BYTECODE_PROGRAMS)" "true"
--	$(MKDIR) "$(INSTALL_FLEXDLLDIR)"
-+	$(BSD_INSTALL_LIB_DIR) "$(INSTALL_FLEXDLLDIR)"
- 	$(INSTALL_DATA) $(addprefix stdlib/flexdll/, $(FLEXDLL_OBJECTS)) \
-     "$(INSTALL_FLEXDLLDIR)"
- endif # ifeq "$(BOOTSTRAPPING_FLEXDLL)" "true"
diff --git a/ocaml/patches/patch-Makefile.build_config.in b/ocaml/patches/patch-Makefile.build_config.in
deleted file mode 100644
index e560ed2067..0000000000
--- a/ocaml/patches/patch-Makefile.build_config.in
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-Use BSD_INSTALL_*
-
---- Makefile.build_config.in.orig	2022-10-12 13:53:12.000000000 +0000
-+++ Makefile.build_config.in
-@@ -25,9 +25,9 @@
- override BUILD_CONFIG_INCLUDED =
- 
- include $(ROOTDIR)/Makefile.config
--INSTALL ?= @INSTALL@ -p
--INSTALL_DATA ?= @INSTALL_DATA@
--INSTALL_PROG ?= @INSTALL_PROGRAM@
-+INSTALL ?= $(BSD_INSTALL)
-+INSTALL_DATA ?= $(BSD_INSTALL_DATA)
-+INSTALL_PROG ?= $(BSD_INSTALL_SCRIPT)
- 
- # Whether to install the native toplevel (ocamlnat)
- INSTALL_OCAMLNAT = @install_ocamlnat@
diff --git a/ocaml/patches/patch-api__docgen_ocamldoc_Makefile b/ocaml/patches/patch-api__docgen_ocamldoc_Makefile
deleted file mode 100644
index cc391fa0dc..0000000000
--- a/ocaml/patches/patch-api__docgen_ocamldoc_Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD$
-
---- api_docgen/ocamldoc/Makefile.orig	2022-10-12 13:53:12.000000000 +0000
-+++ api_docgen/ocamldoc/Makefile
-@@ -19,7 +19,7 @@ include ../../ocamldoc/Makefile.best_oca
- vpath %.mli ../../stdlib $(DOC_COMPILERLIBS_DIRS)  $(DOC_STDLIB_DIRS)
- 
- 
--man: build/man/Stdlib.3o
-+man: build/man/Stdlib.3
- latex: build/latex/Stdlib.tex
- html: \
-   build/html/libref/Stdlib.html \
-@@ -34,7 +34,7 @@ DOC_ALL_INCLUDES = \
- 
- libref=$(stdlib_UNPREFIXED) $(otherlibref)
- 
--ALL_MAN= $(ALL_DOC:%=build/man/%.3o)
-+ALL_MAN= $(ALL_DOC:%=build/man/%.3)
- ALL_LATEX= $(ALL_DOC:%=build/latex/%.tex)
- 
- build/latex/ifocamldoc.tex: | build/latex
-@@ -60,7 +60,7 @@ build/libref/%.odoc: build/%.mld | build
- 	$(OCAMLDOC_RUN) -hide-warnings $(DOC_STDLIB_INCLUDES) -text $< -dump  $@
- 
- ALL_COMPILED_DOC=$(ALL_DOC:%=build/%.odoc)
--build/man/Stdlib.3o: $(ALL_COMPILED_DOC) | build/man
-+build/man/Stdlib.3: $(ALL_COMPILED_DOC) | build/man
- 	$(OCAMLDOC_RUN) -man -d build/man -man-mini \
- 	-nostdlib -hide Stdlib -lib Stdlib -t "OCaml library" \
- 	$(addprefix -load , $(ALL_COMPILED_DOC))
-@@ -123,5 +123,5 @@ build/latex/compilerlibs_input.tex: | bu
- install:
- 	$(MKDIR) "$(INSTALL_LIBRARIES_MAN_DIR)"
- 	if test -d build/man; then \
--	  $(INSTALL_DATA) build/man/*.3o "$(INSTALL_LIBRARIES_MAN_DIR)"; \
-+	  $(INSTALL_DATA) build/man/*.3 "$(INSTALL_LIBRARIES_MAN_DIR)"; \
- 	fi
diff --git a/ocaml/patches/patch-check-linker-version_sh b/ocaml/patches/patch-check-linker-version_sh
deleted file mode 100644
index 2728a4c97b..0000000000
--- a/ocaml/patches/patch-check-linker-version_sh
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-check-linker-version_sh,v 1.1 2020/05/23 20:33:52 rillig Exp $
-
-Fix bashisms.
-
---- testsuite/tests/unwind/check-linker-version.sh.orig	2020-03-18 15:02:03.000000000 +0000
-+++ testsuite/tests/unwind/check-linker-version.sh	2020-05-02 15:40:01.333410019 +0000
-@@ -3,10 +3,10 @@
- LDFULL="`ld -v 2>&1`"
- LD="`echo $LDFULL | grep -o \"ld64-[0-9]*\"`"
- LDVER="`echo $LD | sed \"s/ld64-//\"`"
--if [[ -z "$LD" ]]; then
-+if [ -z "$LD" ]; then
-   echo "unknown linker: pattern ld64-[0-9]* not found in 'ld -v' output";
-   test_result=${TEST_SKIP};
--elif [[ $LDVER -lt 224 ]]; then
-+elif [ $LDVER -lt 224 ]; then
-   echo "ld version is $LDVER, only 224 or above are supported";
-   test_result=${TEST_SKIP};
- else
diff --git a/ocaml/patches/patch-configure b/ocaml/patches/patch-configure
deleted file mode 100644
index 19d5719976..0000000000
--- a/ocaml/patches/patch-configure
+++ /dev/null
@@ -1,183 +0,0 @@
-$NetBSD: patch-configure,v 1.44 2022/05/24 18:25:38 jaapb Exp $
-
-All kinds of OS-specific changes to configure
-Honor LDFLAGS.
-
-Add SunOS -lnsl -lsocket
-Recognise SunOS/amd64 as amd64
-Recognise SunOS as having shared libraries
-
---- configure.orig	2022-02-21 15:57:25.000000000 +0000
-+++ configure
-@@ -14081,7 +14081,7 @@ sharedlib_cflags=''
- mksharedlib='shared-libs-not-available'
- rpath=''
- mksharedlibrpath=''
--natdynlinkopts=""
-+natdynlinkopts="-L/usr/lib -R/usr/lib -R${PREFIX}/lib"
- 
- if test x"$enable_shared" != "xno"; then :
-   case $host in #(
-@@ -14157,6 +14157,8 @@ if test x"$supports_shared_libraries" = 
-     natdynlink=true ;; #(
-   *-pc-windows) :
-     natdynlink=true ;; #(
-+  *-*-solaris*) :
-+    natdynlink=true ;; #(
-   i[3456]86-*-linux*) :
-     natdynlink=true ;; #(
-   i[3456]86-*-gnu*) :
-@@ -14191,6 +14193,8 @@ if test x"$supports_shared_libraries" = 
-     natdynlink=true ;; #(
-   i[3456]86-*-netbsd*) :
-     natdynlink=true ;; #(
-+  powerpc-*-netbsd*) :
-+    natdynlink=true ;; #(
-   x86_64-*-netbsd*) :
-     natdynlink=true ;; #(
-   i386-*-gnu0.3) :
-@@ -14201,12 +14205,16 @@ if test x"$supports_shared_libraries" = 
-     natdynlink=true ;; #(
-   arm*-*-freebsd*) :
-     natdynlink=true ;; #(
-+  arm*-*-netbsd*) :
-+    natdynlink=true ;; #(
-   earm*-*-netbsd*) :
-     natdynlink=true ;; #(
-   aarch64-*-linux*) :
-     natdynlink=true ;; #(
-   aarch64-*-freebsd*) :
-     natdynlink=true ;; #(
-+  aarch64-*-netbsd*) :
-+    natdynlink=true ;; #(
-   aarch64-*-openbsd*) :
-     natdynlink=true ;; #(
-   riscv*-*-linux*) :
-@@ -14315,6 +14323,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-*-gnu*) :
-     arch=i386; system=gnu ;; #(
-   i[3456]86-*-mingw32) :
-@@ -14331,6 +14341,8 @@ case $host in #(
- else
-   model=ppc
- fi; system=elf ;; #(
-+  powerpc-*-netbsd*) :
-+    arch=power; model=ppc; system=netbsd ;; #(
-   s390x*-*-linux*) :
-     arch=s390x; model=z10; system=elf ;; #(
-   # expected to match "gnueabihf" as well as "musleabihf"
-@@ -14350,6 +14362,10 @@ fi; system=elf ;; #(
-     arch=arm; model=armv6; system=linux_eabi ;; #(
-   armv6*-*-freebsd*) :
-     arch=arm; model=armv6; system=freebsd ;; #(
-+  armv6*-*-netbsd*) :
-+    arch=arm; model=armv6; system=netbsd ;; #(
-+  armv7*-*-netbsd*) :
-+    arch=arm; model=armv7; system=netbsd ;; #(
-   earmv6*-*-netbsd*) :
-     arch=arm; model=armv6; system=netbsd ;; #(
-   earmv7*-*-netbsd*) :
-@@ -14394,10 +14410,14 @@ fi; system=elf ;; #(
-     arch=arm64; system=linux ;; #(
-   aarch64-*-freebsd*) :
-     arch=arm64; system=freebsd ;; #(
-+  aarch64-*-netbsd*) :
-+    arch=arm64; system=netbsd ;; #(
-   aarch64-*-openbsd*) :
-     arch=arm64; system=openbsd ;; #(
-   x86_64-*-cygwin*) :
-     arch=amd64; system=cygwin ;; #(
-+  x86_64-*-solaris*) :
-+    arch=arm64; system=solaris ;; #(
-   riscv64-*-linux*) :
-     arch=riscv; model=riscv64; system=linux
-  ;; #(
-@@ -14613,6 +14633,9 @@ case $as_target,$ocaml_cv_cc_vendor in #
-   *) :
-      ;;
- esac ;; #(
-+  power,netbsd):
-+    default_as="${toolpref}as -mppc"
-+    default_aspp="${toolpref}gcc -c " ;; #(
-   i686-pc-windows,*) :
-     default_as="ml -nologo -coff -Cp -c -Fo"
-     default_aspp="$default_as" ;; #(
-@@ -15223,6 +15246,64 @@ if test "x$ac_cv_func_socketpair" = xyes
- 
- fi
-  ;; #(
-+  *-*-solaris*) :
-+    cclibs="$cclibs -lnsl -lsocket"
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
-+$as_echo_n "checking for library containing socket... " >&6; }
-+if ${ac_cv_search_socket+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char socket ();
-+int
-+main ()
-+{
-+return socket ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' ws2_32; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_socket=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext
-+  if ${ac_cv_search_socket+:} false; then :
-+  break
-+fi
-+done
-+if ${ac_cv_search_socket+:} false; then :
-+
-+else
-+  ac_cv_search_socket=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
-+$as_echo "$ac_cv_search_socket" >&6; }
-+ac_res=$ac_cv_search_socket
-+if test "$ac_res" != no; then :
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+fi
-+ ;; #(
-   *-*-haiku) :
-     cclibs="$cclibs -lnetwork"
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
-@@ -17374,7 +17455,7 @@ as_has_debug_prefix_map=false
- asm_cfi_supported=false
- if $native_compiler; then :
-   case $host in #(
--  *-*-mingw32|*-pc-windows) :
-+  *-*-mingw32|*-pc-windows|*-*-netbsd*) :
-      ;; #(
-   *) :
- 
diff --git a/ocaml/patches/patch-lex_Makefile b/ocaml/patches/patch-lex_Makefile
deleted file mode 100644
index 3cc5e8f921..0000000000
--- a/ocaml/patches/patch-lex_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- lex/Makefile.orig	2022-10-12 13:53:13.000000000 +0000
-+++ lex/Makefile
-@@ -34,7 +34,7 @@ CAMLC = $(BOOT_OCAMLC) $(BOOT_STDLIBFLAG
- CAMLOPT = $(OCAMLRUN) $(ROOTDIR)/ocamlopt$(EXE) $(STDLIBFLAGS)
- COMPFLAGS = -g -absname -w +a-4-9-41-42-44-45-48-70 -warn-error +A \
-             -safe-string -strict-sequence -strict-formats -bin-annot
--LINKFLAGS = -g
-+LINKFLAGS = -g -cclib "$(LDFLAGS)" # JPB: remove the -g for the non-beta-version, I guess
- 
- OBJS=cset.cmo syntax.cmo parser.cmo lexer.cmo table.cmo lexgen.cmo \
-      compact.cmo common.cmo output.cmo outputbis.cmo main.cmo
diff --git a/ocaml/patches/patch-man_Makefile b/ocaml/patches/patch-man_Makefile
deleted file mode 100644
index 65c124f23e..0000000000
--- a/ocaml/patches/patch-man_Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-man_Makefile,v 1.5 2022/05/24 18:25:38 jaapb Exp $
-
-Use BSD_INSTALL_* instead of mkdir and cp
-
---- man/Makefile.orig	2022-02-08 16:50:12.000000000 +0000
-+++ man/Makefile
-@@ -22,5 +22,5 @@ MANPAGES = $(addsuffix .1,\
- 
- .PHONY: install
- install:
--	$(MKDIR) $(INSTALL_PROGRAMS_MAN_DIR)
--	$(INSTALL_DATA) $(MANPAGES) $(INSTALL_PROGRAMS_MAN_DIR)
-+	$(BSD_INSTALL_MAN_DIR) $(INSTALL_PROGRAMS_MAN_DIR)
-+	$(BSD_INSTALL_MAN) $(MANPAGES) $(INSTALL_PROGRAMS_MAN_DIR)
diff --git a/ocaml/patches/patch-ocamldoc_Makefile b/ocaml/patches/patch-ocamldoc_Makefile
deleted file mode 100644
index 7f0a07546b..0000000000
--- a/ocaml/patches/patch-ocamldoc_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- ocamldoc/Makefile.orig	2022-10-12 13:53:13.000000000 +0000
-+++ ocamldoc/Makefile
-@@ -66,7 +66,7 @@ COMPFLAGS = \
-   -g $(INCLUDES) -absname -w +a-4-9-41-42-44-45-48-70 -warn-error +A \
-   -safe-string -strict-sequence -strict-formats -bin-annot -principal
- 
--LINKFLAGS = -g $(INCLUDES)
-+LINKFLAGS = -g $(INCLUDES) -cclib "$(LDFLAGS)" # JPB: remove -g?
- 
- CMOFILES=\
-   odoc_config.cmo \
diff --git a/ocaml/patches/patch-ocamldoc_odoc__messages.ml b/ocaml/patches/patch-ocamldoc_odoc__messages.ml
deleted file mode 100644
index 688a0a4c04..0000000000
--- a/ocaml/patches/patch-ocamldoc_odoc__messages.ml
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ocamldoc_odoc__messages.ml,v 1.3 2015/12/29 23:34:53 dholland Exp $
-
-Put man pages in section 3 rather than 3o
-
---- ocamldoc/odoc_messages.ml.orig	2014-09-26 13:00:20.000000000 +0000
-+++ ocamldoc/odoc_messages.ml
-@@ -89,7 +89,7 @@ let default_man_section = "3"
- let man_section = "<section> Use <section> in man page files "^
-   "(default is "^default_man_section^") "^man_only^"\n"
- 
--let default_man_suffix = default_man_section^"o"
-+let default_man_suffix = default_man_section
- let man_suffix = "<suffix> Use <suffix> for man page files "^
-   "(default is "^default_man_suffix^") "^man_only^"\n"
- 
diff --git a/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common b/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
deleted file mode 100644
index cab79ae2b8..0000000000
--- a/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- otherlibs/Makefile.otherlibs.common.orig	2022-10-12 13:53:13.000000000 +0000
-+++ otherlibs/Makefile.otherlibs.common
-@@ -45,7 +45,7 @@ MKLIB=$(OCAMLRUN) $(ROOTDIR)/tools/ocaml
- COBJS ?=
- EXTRACAMLFLAGS ?=
- LINKOPTS ?=
--LDOPTS ?=
-+LDOPTS ?= -ldopt "$(LDFLAGS)"
- HEADERS ?=
- CMIFILES ?= $(CAMLOBJS:.cmo=.cmi)
- CAMLOBJS_NAT ?= $(CAMLOBJS:.cmo=.cmx)
diff --git a/ocaml/patches/patch-otherlibs_systhreads_Makefile b/ocaml/patches/patch-otherlibs_systhreads_Makefile
deleted file mode 100644
index a279d1b8b1..0000000000
--- a/ocaml/patches/patch-otherlibs_systhreads_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- otherlibs/systhreads/Makefile.orig	2022-10-12 13:53:13.000000000 +0000
-+++ otherlibs/systhreads/Makefile
-@@ -118,7 +118,7 @@ install:
- 	  $(INSTALL_PROG) dllthreads$(EXT_DLL) "$(INSTALL_STUBLIBDIR)"; \
- 	fi
- 	$(INSTALL_DATA) libthreads.$(A) "$(INSTALL_LIBDIR)"
--	$(MKDIR) "$(INSTALL_THREADSLIBDIR)"
-+	$(BSD_INSTALL_LIB_DIR) "$(INSTALL_THREADSLIBDIR)"
- 	$(INSTALL_DATA) \
- 	  $(CMIFILES) threads.cma META \
- 	  "$(INSTALL_THREADSLIBDIR)"
diff --git a/ocaml/patches/patch-otherlibs_systhreads_st__stubs.c b/ocaml/patches/patch-otherlibs_systhreads_st__stubs.c
deleted file mode 100644
index de934490d8..0000000000
--- a/ocaml/patches/patch-otherlibs_systhreads_st__stubs.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
---- otherlibs/systhreads/st_stubs.c.orig	2022-10-12 13:53:13.000000000 +0000
-+++ otherlibs/systhreads/st_stubs.c
-@@ -15,6 +15,9 @@
- 
- #define CAML_INTERNALS
- 
-+/* Needed for sigwait */
-+#define _POSIX_PTHREAD_SEMANTICS
-+
- #if defined(_WIN32) && !defined(NATIVE_CODE)
- /* Ensure that pthread.h marks symbols __declspec(dllimport) so that they can be
-    picked up from the runtime (which will have linked winpthreads statically) */
diff --git a/ocaml/patches/patch-otherlibs_unix_Makefile b/ocaml/patches/patch-otherlibs_unix_Makefile
deleted file mode 100644
index 9b7bcdf955..0000000000
--- a/ocaml/patches/patch-otherlibs_unix_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- otherlibs/unix/Makefile.orig	2022-10-12 13:53:13.000000000 +0000
-+++ otherlibs/unix/Makefile
-@@ -40,7 +40,7 @@ LINKOPTS=$(addprefix -cclib ,$(WIN32_LIB
- LDOPTS=$(addprefix -ldopt ,$(WIN32_LIBS))
- else # Unix
- # dllunix.so particularly requires libm for modf symbols
--LDOPTS=$(NATIVECCLIBS)
-+LDOPTS=$(NATIVECCLIBS) "$(LDFLAGS)"
- endif
- 
- # C source files common to both Unix and Windows
diff --git a/ocaml/patches/patch-runtime_floats.c b/ocaml/patches/patch-runtime_floats.c
deleted file mode 100644
index 472ee10ec1..0000000000
--- a/ocaml/patches/patch-runtime_floats.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-runtime_floats.c,v 1.1 2022/05/24 18:25:38 jaapb Exp $
-
-math.h on NetBSD 9 only declares copysign if _NETBSD_SOURCE is defined
-(implicitly or explicitly).  However copysign is specified by POSIX
-since Issue 6, and derived form C99:
-  https://pubs.opengroup.org/onlinepubs/9699919799/
-
-Not filed upstream pending discussion within NetBSD.
-
---- runtime/floats.c.orig	2022-02-21 15:57:25.000000000 +0000
-+++ runtime/floats.c
-@@ -23,6 +23,9 @@
- /* Needed for strtod_l */
- #define _GNU_SOURCE
- 
-+/* Work around NetBSD 9 math.h bug of guarding copysign decl */
-+#define _NETBSD_SOURCE
-+
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/ocaml/patches/patch-runtime_sak.c b/ocaml/patches/patch-runtime_sak.c
deleted file mode 100644
index 9e36a2755c..0000000000
--- a/ocaml/patches/patch-runtime_sak.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-runtime_sak.c,v 1.1 2022/05/24 18:25:38 jaapb Exp $
-
-Explicit cast to int to eliminate warning
-
---- runtime/sak.c.orig	2022-02-21 15:57:25.000000000 +0000
-+++ runtime/sak.c
-@@ -123,7 +123,7 @@ void add_stdlib_prefix(int count, char_o
-     } else {
-       /* name is a null-terminated string, so an empty string simply has the
-          null-terminator "capitalised". */
--      *name = toupper_os(*name);
-+      *name = toupper_os((int) *name);
-       printf_os(T(" stdlib__%s"), name);
-     }
-   }
diff --git a/ocaml/patches/patch-testsuite_tests_lib-systhreads_testyield.ml b/ocaml/patches/patch-testsuite_tests_lib-systhreads_testyield.ml
deleted file mode 100644
index 89fb21342f..0000000000
--- a/ocaml/patches/patch-testsuite_tests_lib-systhreads_testyield.ml
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-testsuite_tests_lib-systhreads_testyield.ml,v 1.2 2020/12/09 10:33:04 jaapb Exp $
-
-On NetBSD, the "thread scheduler" appears to just schedule two
-threads out of 4 when all they in essence to is "yield", and not
-do round-robin scheduling, causing the test to loop.  Reduce the
-number of threads in the test to 2.
-
---- testsuite/tests/lib-systhreads/testyield.ml.orig	2020-09-01 12:47:58.000000000 +0000
-+++ testsuite/tests/lib-systhreads/testyield.ml
-@@ -8,7 +8,7 @@
-    *** native
- *)
- 
--let threads = 4
-+let threads = 2
- 
- let are_ready = ref 0
- 
diff --git a/ocaml/patches/patch-tools_Makefile b/ocaml/patches/patch-tools_Makefile
deleted file mode 100644
index afe9edd490..0000000000
--- a/ocaml/patches/patch-tools_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- tools/Makefile.orig	2022-10-12 13:53:13.000000000 +0000
-+++ tools/Makefile
-@@ -42,7 +42,7 @@ DIRS = $(addprefix $(ROOTDIR)/,utils par
- INCLUDES = $(addprefix -I ,$(DIRS))
- COMPFLAGS = -absname -w +a-4-9-41-42-44-45-48-70 -strict-sequence \
- -warn-error +A -principal -safe-string -strict-formats -bin-annot $(INCLUDES)
--LINKFLAGS = $(INCLUDES)
-+LINKFLAGS = $(INCLUDES) -cclib "$(LDFLAGS)"
- VPATH := $(filter-out -I,$(INCLUDES))
- 
- programs_byte := \
diff --git a/ocaml/patches/patch-tools_ocamlmklib.ml b/ocaml/patches/patch-tools_ocamlmklib.ml
deleted file mode 100644
index 1cc6566d4c..0000000000
--- a/ocaml/patches/patch-tools_ocamlmklib.ml
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD$
-
---- tools/ocamlmklib.ml.orig	2022-10-12 13:53:13.000000000 +0000
-+++ tools/ocamlmklib.ml
-@@ -40,6 +40,7 @@ and c_objs = ref []         (* .o, .a, .
- and caml_libs = ref []      (* -cclib to pass to ocamlc, ocamlopt *)
- and caml_opts = ref []      (* -ccopt to pass to ocamlc, ocamlopt *)
- and dynlink = ref Config.supports_shared_libraries
-+and elfmode = ref false     (* do not add C link lib path to run-time path *)
- and failsafe = ref false    (* whether to fall back on static build only *)
- and c_libs = ref []         (* libs to pass to mkdll and ocamlc -cclib *)
- and c_Lopts = ref []      (* options to pass to mkdll and ocamlc -cclib *)
-@@ -105,6 +106,8 @@ let parse_arguments argv =
-       c_objs := s :: !c_objs
-     else if s = "-cclib" then
-       caml_libs := next_arg s :: "-cclib" :: !caml_libs
-+		else if starts_with s "-Wl,-z" then
-+			c_libs := s :: !c_libs
-     else if s = "-ccopt" then
-       caml_opts := next_arg s :: "-ccopt" :: !caml_opts
-     else if s = "-custom" then
-@@ -131,8 +134,9 @@ let parse_arguments argv =
-       c_libs := s :: !c_libs
-     else if starts_with s "-L" then
-      (c_Lopts := s :: !c_Lopts;
--      let l = chop_prefix s "-L" in
--      if not (Filename.is_relative l) then rpath := l :: !rpath)
-+		 if not !elfmode then
-+     (let l = chop_prefix s "-L" in
-+      if not (Filename.is_relative l) then rpath := l :: !rpath))
-     else if s = "-ocamlcflags" then
-       ocamlc_opts := next_arg s :: !ocamlc_opts
-     else if s = "-ocamlc" then
-@@ -147,6 +151,8 @@ let parse_arguments argv =
-       output_c := next_arg s
-     else if s = "-dllpath" || s = "-R" || s = "-rpath" then
-       rpath := next_arg s :: !rpath
-+		else if s = "-elfmode" then
-+		  elfmode := true
-     else if starts_with s "-R" then
-       rpath := chop_prefix s "-R" :: !rpath
-     else if s = "-Wl,-rpath" then
-@@ -195,6 +201,7 @@ Usage: ocamlmklib [options] <.cmo|.cma|.
- \n  -custom        Disable dynamic loading\
- \n  -g             Build with debug information\
- \n  -dllpath <dir> Add <dir> to the run-time search path for DLLs\
-+\n  -elfmode       Do not add link-time search path to run-time path\
- \n  -F<dir>        Specify a framework directory (MacOSX)\
- \n  -framework <name>    Use framework <name> (MacOSX)\
- \n  -help          Print this help message and exit\



Home | Main Index | Thread Index | Old Index