pkgsrc-WIP-changes archive

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

Update to 4.14.0beta1 and package refactor



Module Name:	pkgsrc-wip
Committed By:	Jaap Boender <jaapb%netbsd.org@localhost>
Pushed By:	jaapb
Date:		Thu Feb 24 09:23:33 2022 +0100
Changeset:	0e0533d857e1ff70fd649d4eb11aae4e6c2513af

Modified Files:
	ocaml/Makefile
	ocaml/Makefile.common
	ocaml/PLIST
	ocaml/buildlink3.mk
	ocaml/distinfo
	ocaml/options.mk
	ocaml/patches/patch-api__docgen_ocamldoc_Makefile
	ocaml/patches/patch-configure
Added Files:
	ocaml/native.mk
	ocaml/ocaml.mk
	ocaml/patches/patch-runtime_sak.c

Log Message:
Update to 4.14.0beta1 and package refactor

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

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

diffstat:
 ocaml/Makefile                                    |   15 +-
 ocaml/Makefile.common                             |    2 +-
 ocaml/PLIST                                       | 1922 ++++++++++-----------
 ocaml/buildlink3.mk                               |    1 +
 ocaml/distinfo                                    |   11 +-
 ocaml/native.mk                                   |   48 +
 ocaml/ocaml.mk                                    |  252 +++
 ocaml/options.mk                                  |   13 +-
 ocaml/patches/patch-api__docgen_ocamldoc_Makefile |   12 +-
 ocaml/patches/patch-configure                     |   30 +-
 ocaml/patches/patch-runtime_sak.c                 |   13 +
 11 files changed, 1318 insertions(+), 1001 deletions(-)

diffs:
diff --git a/ocaml/Makefile b/ocaml/Makefile
index 47b388d337..d61dc8d044 100644
--- a/ocaml/Makefile
+++ b/ocaml/Makefile
@@ -16,9 +16,18 @@ USE_GNU_CONFIGURE_HOST=	no
 #USE_GCC_RUNTIME=	yes
 
 .include "options.mk"
-###
-### PLIST components
-###
+.include "native.mk"
+
+# Options
+
+.if ${OCAML_USE_OPT_COMPILER} == "yes"
+CONFIGURE_ARGS+=       --enable-native-compiler
+BUILD_TARGET=          world.opt
+PLIST.native=          yes     
+.else
+CONFIGURE_ARGS+=       --disable-native-compiler
+BUILD_TARGET=          world
+.endif
 
 # This is needed because ${WRKSRC}/build/partial-install.sh uses
 # $PWD as part of its script.  However, with /bin/sh on SunOS
diff --git a/ocaml/Makefile.common b/ocaml/Makefile.common
index 25d4ca9dfa..e7efa44caa 100644
--- a/ocaml/Makefile.common
+++ b/ocaml/Makefile.common
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile.common,v 1.62 2021/03/08 08:08:43 jaapb Exp $
 
 # used by x11/labltk/Makefile
-DISTNAME=	ocaml-4.14.0~alpha2
+DISTNAME=	ocaml-4.14.0~beta1
 CATEGORIES=	lang
 MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-4.14/
 #EXTRACT_SUFX=	.tar.bz2
diff --git a/ocaml/PLIST b/ocaml/PLIST
index 9685135a96..49a95c88da 100644
--- a/ocaml/PLIST
+++ b/ocaml/PLIST
@@ -2,38 +2,38 @@
 bin/ocaml
 bin/ocamlc
 bin/ocamlc.byte
-${PLIST.native}bin/ocamlc.opt
+${PLIST.ocaml-opt}bin/ocamlc.opt
 bin/ocamlcmt
 bin/ocamlcp
 bin/ocamlcp.byte
-${PLIST.native}bin/ocamlcp.opt
+${PLIST.ocaml-opt}bin/ocamlcp.opt
 bin/ocamldebug
 bin/ocamldep
 bin/ocamldep.byte
-${PLIST.native}bin/ocamldep.opt
+${PLIST.ocaml-opt}bin/ocamldep.opt
 bin/ocamldoc
-${PLIST.native}bin/ocamldoc.opt
+${PLIST.ocaml-opt}bin/ocamldoc.opt
 bin/ocamllex
 bin/ocamllex.byte
-${PLIST.native}bin/ocamllex.opt
+${PLIST.ocaml-opt}bin/ocamllex.opt
 bin/ocamlmklib
 bin/ocamlmklib.byte
-${PLIST.native}bin/ocamlmklib.opt
+${PLIST.ocaml-opt}bin/ocamlmklib.opt
 bin/ocamlmktop
 bin/ocamlmktop.byte
-${PLIST.native}bin/ocamlmktop.opt
+${PLIST.ocaml-opt}bin/ocamlmktop.opt
 bin/ocamlobjinfo
 bin/ocamlobjinfo.byte
-${PLIST.native}bin/ocamlobjinfo.opt
-${PLIST.native}bin/ocamlopt
-${PLIST.native}bin/ocamlopt.byte
-${PLIST.native}bin/ocamlopt.opt
+${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.native}bin/ocamloptp.opt
+${PLIST.ocaml-opt}bin/ocamloptp.opt
 bin/ocamlprof
 bin/ocamlprof.byte
-${PLIST.native}bin/ocamlprof.opt
+${PLIST.ocaml-opt}bin/ocamlprof.opt
 bin/ocamlrun
 bin/ocamlrund
 bin/ocamlruni
@@ -47,13 +47,13 @@ lib/ocaml/arrayLabels.ml
 lib/ocaml/arrayLabels.mli
 lib/ocaml/atomic.ml
 lib/ocaml/atomic.mli
-${PLIST.native}lib/ocaml/bigarray.a
+${PLIST.ocaml-opt}lib/ocaml/bigarray.a
 lib/ocaml/bigarray.cma
 lib/ocaml/bigarray.cmi
 lib/ocaml/bigarray.cmti
-${PLIST.native}lib/ocaml/bigarray.cmx
-${PLIST.native}lib/ocaml/bigarray.cmxa
-${PLIST.native}lib/ocaml/bigarray.cmxs
+${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
@@ -137,114 +137,114 @@ lib/ocaml/camlheaderi
 lib/ocaml/camlinternalAtomic.cmi
 lib/ocaml/camlinternalAtomic.cmt
 lib/ocaml/camlinternalAtomic.cmti
-${PLIST.native}lib/ocaml/camlinternalAtomic.cmx
+${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
-${PLIST.native}lib/ocaml/camlinternalFormat.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlinternalFormat.cmx
 lib/ocaml/camlinternalFormat.ml
 lib/ocaml/camlinternalFormat.mli
 lib/ocaml/camlinternalFormatBasics.cmi
 lib/ocaml/camlinternalFormatBasics.cmt
 lib/ocaml/camlinternalFormatBasics.cmti
-${PLIST.native}lib/ocaml/camlinternalFormatBasics.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlinternalFormatBasics.cmx
 lib/ocaml/camlinternalFormatBasics.ml
 lib/ocaml/camlinternalFormatBasics.mli
 lib/ocaml/camlinternalLazy.cmi
 lib/ocaml/camlinternalLazy.cmt
 lib/ocaml/camlinternalLazy.cmti
-${PLIST.native}lib/ocaml/camlinternalLazy.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlinternalLazy.cmx
 lib/ocaml/camlinternalLazy.ml
 lib/ocaml/camlinternalLazy.mli
 lib/ocaml/camlinternalMod.cmi
 lib/ocaml/camlinternalMod.cmt
 lib/ocaml/camlinternalMod.cmti
-${PLIST.native}lib/ocaml/camlinternalMod.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlinternalMod.cmx
 lib/ocaml/camlinternalMod.ml
 lib/ocaml/camlinternalMod.mli
 lib/ocaml/camlinternalOO.cmi
 lib/ocaml/camlinternalOO.cmt
 lib/ocaml/camlinternalOO.cmti
-${PLIST.native}lib/ocaml/camlinternalOO.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlinternalOO.cmx
 lib/ocaml/camlinternalOO.ml
 lib/ocaml/camlinternalOO.mli
 lib/ocaml/char.ml
 lib/ocaml/char.mli
-${PLIST.native}lib/ocaml/compiler-libs/CSE.cmi
-${PLIST.native}lib/ocaml/compiler-libs/CSE.cmt
-${PLIST.native}lib/ocaml/compiler-libs/CSE.cmx
-${PLIST.native}lib/ocaml/compiler-libs/CSEgen.cmi
-${PLIST.native}lib/ocaml/compiler-libs/CSEgen.cmt
-${PLIST.native}lib/ocaml/compiler-libs/CSEgen.cmti
-${PLIST.native}lib/ocaml/compiler-libs/CSEgen.cmx
-${PLIST.native}lib/ocaml/compiler-libs/CSEgen.mli
-${PLIST.native}lib/ocaml/compiler-libs/afl_instrument.cmi
-${PLIST.native}lib/ocaml/compiler-libs/afl_instrument.cmt
-${PLIST.native}lib/ocaml/compiler-libs/afl_instrument.cmti
-${PLIST.native}lib/ocaml/compiler-libs/afl_instrument.cmx
-${PLIST.native}lib/ocaml/compiler-libs/afl_instrument.mli
-${PLIST.native}lib/ocaml/compiler-libs/alias_analysis.cmi
-${PLIST.native}lib/ocaml/compiler-libs/alias_analysis.cmt
-${PLIST.native}lib/ocaml/compiler-libs/alias_analysis.cmti
-${PLIST.native}lib/ocaml/compiler-libs/alias_analysis.cmx
-${PLIST.native}lib/ocaml/compiler-libs/alias_analysis.mli
-${PLIST.native}lib/ocaml/compiler-libs/allocated_const.cmi
-${PLIST.native}lib/ocaml/compiler-libs/allocated_const.cmt
-${PLIST.native}lib/ocaml/compiler-libs/allocated_const.cmti
-${PLIST.native}lib/ocaml/compiler-libs/allocated_const.cmx
-${PLIST.native}lib/ocaml/compiler-libs/allocated_const.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/CSE.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/CSE.cmt
+${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
+${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
+${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
+${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/allocated_const.cmx
+${PLIST.ocaml-opt}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.native}lib/ocaml/compiler-libs/arch.cmi
-${PLIST.native}lib/ocaml/compiler-libs/arch.cmt
-${PLIST.native}lib/ocaml/compiler-libs/arch.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/arch.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/arch.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/arch.cmx
 lib/ocaml/compiler-libs/arg_helper.cmi
 lib/ocaml/compiler-libs/arg_helper.cmt
 lib/ocaml/compiler-libs/arg_helper.cmti
-${PLIST.native}lib/ocaml/compiler-libs/arg_helper.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/arg_helper.cmx
 lib/ocaml/compiler-libs/arg_helper.mli
-${PLIST.native}lib/ocaml/compiler-libs/asmgen.cmi
-${PLIST.native}lib/ocaml/compiler-libs/asmgen.cmt
-${PLIST.native}lib/ocaml/compiler-libs/asmgen.cmti
-${PLIST.native}lib/ocaml/compiler-libs/asmgen.cmx
-${PLIST.native}lib/ocaml/compiler-libs/asmgen.mli
-${PLIST.native}lib/ocaml/compiler-libs/asmlibrarian.cmi
-${PLIST.native}lib/ocaml/compiler-libs/asmlibrarian.cmt
-${PLIST.native}lib/ocaml/compiler-libs/asmlibrarian.cmti
-${PLIST.native}lib/ocaml/compiler-libs/asmlibrarian.cmx
-${PLIST.native}lib/ocaml/compiler-libs/asmlibrarian.mli
-${PLIST.native}lib/ocaml/compiler-libs/asmlink.cmi
-${PLIST.native}lib/ocaml/compiler-libs/asmlink.cmt
-${PLIST.native}lib/ocaml/compiler-libs/asmlink.cmti
-${PLIST.native}lib/ocaml/compiler-libs/asmlink.cmx
-${PLIST.native}lib/ocaml/compiler-libs/asmlink.mli
-${PLIST.native}lib/ocaml/compiler-libs/asmpackager.cmi
-${PLIST.native}lib/ocaml/compiler-libs/asmpackager.cmt
-${PLIST.native}lib/ocaml/compiler-libs/asmpackager.cmti
-${PLIST.native}lib/ocaml/compiler-libs/asmpackager.cmx
-${PLIST.native}lib/ocaml/compiler-libs/asmpackager.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
+${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
+${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
+${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/asmpackager.cmx
+${PLIST.ocaml-opt}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
-${PLIST.native}lib/ocaml/compiler-libs/ast_helper.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ast_helper.cmx
 lib/ocaml/compiler-libs/ast_helper.mli
 lib/ocaml/compiler-libs/ast_invariants.cmi
 lib/ocaml/compiler-libs/ast_invariants.cmt
 lib/ocaml/compiler-libs/ast_invariants.cmti
-${PLIST.native}lib/ocaml/compiler-libs/ast_invariants.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ast_invariants.cmx
 lib/ocaml/compiler-libs/ast_invariants.mli
 lib/ocaml/compiler-libs/ast_iterator.cmi
 lib/ocaml/compiler-libs/ast_iterator.cmt
 lib/ocaml/compiler-libs/ast_iterator.cmti
-${PLIST.native}lib/ocaml/compiler-libs/ast_iterator.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ast_iterator.cmx
 lib/ocaml/compiler-libs/ast_iterator.mli
 lib/ocaml/compiler-libs/ast_mapper.cmi
 lib/ocaml/compiler-libs/ast_mapper.cmt
 lib/ocaml/compiler-libs/ast_mapper.cmti
-${PLIST.native}lib/ocaml/compiler-libs/ast_mapper.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ast_mapper.cmx
 lib/ocaml/compiler-libs/ast_mapper.mli
 lib/ocaml/compiler-libs/asttypes.cmi
 lib/ocaml/compiler-libs/asttypes.cmti
@@ -252,184 +252,184 @@ lib/ocaml/compiler-libs/asttypes.mli
 lib/ocaml/compiler-libs/attr_helper.cmi
 lib/ocaml/compiler-libs/attr_helper.cmt
 lib/ocaml/compiler-libs/attr_helper.cmti
-${PLIST.native}lib/ocaml/compiler-libs/attr_helper.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/attr_helper.cmx
 lib/ocaml/compiler-libs/attr_helper.mli
-${PLIST.native}lib/ocaml/compiler-libs/augment_specialised_args.cmi
-${PLIST.native}lib/ocaml/compiler-libs/augment_specialised_args.cmt
-${PLIST.native}lib/ocaml/compiler-libs/augment_specialised_args.cmti
-${PLIST.native}lib/ocaml/compiler-libs/augment_specialised_args.cmx
-${PLIST.native}lib/ocaml/compiler-libs/augment_specialised_args.mli
-${PLIST.native}lib/ocaml/compiler-libs/backend_intf.cmi
-${PLIST.native}lib/ocaml/compiler-libs/backend_intf.cmti
-${PLIST.native}lib/ocaml/compiler-libs/backend_intf.mli
-${PLIST.native}lib/ocaml/compiler-libs/backend_var.cmi
-${PLIST.native}lib/ocaml/compiler-libs/backend_var.cmt
-${PLIST.native}lib/ocaml/compiler-libs/backend_var.cmti
-${PLIST.native}lib/ocaml/compiler-libs/backend_var.cmx
-${PLIST.native}lib/ocaml/compiler-libs/backend_var.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
+${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/backend_var.cmx
+${PLIST.ocaml-opt}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.native}lib/ocaml/compiler-libs/binutils.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/binutils.cmx
 lib/ocaml/compiler-libs/binutils.mli
-${PLIST.native}lib/ocaml/compiler-libs/branch_relaxation.cmi
-${PLIST.native}lib/ocaml/compiler-libs/branch_relaxation.cmt
-${PLIST.native}lib/ocaml/compiler-libs/branch_relaxation.cmti
-${PLIST.native}lib/ocaml/compiler-libs/branch_relaxation.cmx
-${PLIST.native}lib/ocaml/compiler-libs/branch_relaxation.mli
-${PLIST.native}lib/ocaml/compiler-libs/branch_relaxation_intf.cmi
-${PLIST.native}lib/ocaml/compiler-libs/branch_relaxation_intf.cmt
-${PLIST.native}lib/ocaml/compiler-libs/branch_relaxation_intf.cmx
+${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
+${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/btype.cmi
 lib/ocaml/compiler-libs/btype.cmt
 lib/ocaml/compiler-libs/btype.cmti
-${PLIST.native}lib/ocaml/compiler-libs/btype.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/btype.cmx
 lib/ocaml/compiler-libs/btype.mli
-${PLIST.native}lib/ocaml/compiler-libs/build_export_info.cmi
-${PLIST.native}lib/ocaml/compiler-libs/build_export_info.cmt
-${PLIST.native}lib/ocaml/compiler-libs/build_export_info.cmti
-${PLIST.native}lib/ocaml/compiler-libs/build_export_info.cmx
-${PLIST.native}lib/ocaml/compiler-libs/build_export_info.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
+${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_path_prefix_map.cmi
 lib/ocaml/compiler-libs/build_path_prefix_map.cmt
 lib/ocaml/compiler-libs/build_path_prefix_map.cmti
-${PLIST.native}lib/ocaml/compiler-libs/build_path_prefix_map.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/build_path_prefix_map.cmx
 lib/ocaml/compiler-libs/build_path_prefix_map.mli
 lib/ocaml/compiler-libs/builtin_attributes.cmi
 lib/ocaml/compiler-libs/builtin_attributes.cmt
 lib/ocaml/compiler-libs/builtin_attributes.cmti
-${PLIST.native}lib/ocaml/compiler-libs/builtin_attributes.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/builtin_attributes.cmx
 lib/ocaml/compiler-libs/builtin_attributes.mli
 lib/ocaml/compiler-libs/bytegen.cmi
 lib/ocaml/compiler-libs/bytegen.cmt
 lib/ocaml/compiler-libs/bytegen.cmti
-${PLIST.native}lib/ocaml/compiler-libs/bytegen.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/bytegen.cmx
 lib/ocaml/compiler-libs/bytegen.mli
 lib/ocaml/compiler-libs/bytelibrarian.cmi
 lib/ocaml/compiler-libs/bytelibrarian.cmt
 lib/ocaml/compiler-libs/bytelibrarian.cmti
-${PLIST.native}lib/ocaml/compiler-libs/bytelibrarian.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/bytelibrarian.cmx
 lib/ocaml/compiler-libs/bytelibrarian.mli
 lib/ocaml/compiler-libs/bytelink.cmi
 lib/ocaml/compiler-libs/bytelink.cmt
 lib/ocaml/compiler-libs/bytelink.cmti
-${PLIST.native}lib/ocaml/compiler-libs/bytelink.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/bytelink.cmx
 lib/ocaml/compiler-libs/bytelink.mli
 lib/ocaml/compiler-libs/bytepackager.cmi
 lib/ocaml/compiler-libs/bytepackager.cmt
 lib/ocaml/compiler-libs/bytepackager.cmti
-${PLIST.native}lib/ocaml/compiler-libs/bytepackager.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/bytepackager.cmx
 lib/ocaml/compiler-libs/bytepackager.mli
 lib/ocaml/compiler-libs/bytesections.cmi
 lib/ocaml/compiler-libs/bytesections.cmt
 lib/ocaml/compiler-libs/bytesections.cmti
-${PLIST.native}lib/ocaml/compiler-libs/bytesections.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/bytesections.cmx
 lib/ocaml/compiler-libs/bytesections.mli
 lib/ocaml/compiler-libs/camlinternalMenhirLib.cmi
 lib/ocaml/compiler-libs/camlinternalMenhirLib.cmt
 lib/ocaml/compiler-libs/camlinternalMenhirLib.cmti
-${PLIST.native}lib/ocaml/compiler-libs/camlinternalMenhirLib.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/camlinternalMenhirLib.cmx
 lib/ocaml/compiler-libs/camlinternalMenhirLib.mli
 lib/ocaml/compiler-libs/ccomp.cmi
 lib/ocaml/compiler-libs/ccomp.cmt
 lib/ocaml/compiler-libs/ccomp.cmti
-${PLIST.native}lib/ocaml/compiler-libs/ccomp.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ccomp.cmx
 lib/ocaml/compiler-libs/ccomp.mli
-${PLIST.native}lib/ocaml/compiler-libs/clambda.cmi
-${PLIST.native}lib/ocaml/compiler-libs/clambda.cmt
-${PLIST.native}lib/ocaml/compiler-libs/clambda.cmti
-${PLIST.native}lib/ocaml/compiler-libs/clambda.cmx
-${PLIST.native}lib/ocaml/compiler-libs/clambda.mli
-${PLIST.native}lib/ocaml/compiler-libs/clambda_primitives.cmi
-${PLIST.native}lib/ocaml/compiler-libs/clambda_primitives.cmt
-${PLIST.native}lib/ocaml/compiler-libs/clambda_primitives.cmti
-${PLIST.native}lib/ocaml/compiler-libs/clambda_primitives.cmx
-${PLIST.native}lib/ocaml/compiler-libs/clambda_primitives.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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda_primitives.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda_primitives.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda_primitives.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda_primitives.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clambda_primitives.mli
 lib/ocaml/compiler-libs/clflags.cmi
 lib/ocaml/compiler-libs/clflags.cmt
 lib/ocaml/compiler-libs/clflags.cmti
-${PLIST.native}lib/ocaml/compiler-libs/clflags.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/clflags.cmx
 lib/ocaml/compiler-libs/clflags.mli
-${PLIST.native}lib/ocaml/compiler-libs/closure.cmi
-${PLIST.native}lib/ocaml/compiler-libs/closure.cmt
-${PLIST.native}lib/ocaml/compiler-libs/closure.cmti
-${PLIST.native}lib/ocaml/compiler-libs/closure.cmx
-${PLIST.native}lib/ocaml/compiler-libs/closure.mli
-${PLIST.native}lib/ocaml/compiler-libs/closure_conversion.cmi
-${PLIST.native}lib/ocaml/compiler-libs/closure_conversion.cmt
-${PLIST.native}lib/ocaml/compiler-libs/closure_conversion.cmti
-${PLIST.native}lib/ocaml/compiler-libs/closure_conversion.cmx
-${PLIST.native}lib/ocaml/compiler-libs/closure_conversion.mli
-${PLIST.native}lib/ocaml/compiler-libs/closure_conversion_aux.cmi
-${PLIST.native}lib/ocaml/compiler-libs/closure_conversion_aux.cmt
-${PLIST.native}lib/ocaml/compiler-libs/closure_conversion_aux.cmti
-${PLIST.native}lib/ocaml/compiler-libs/closure_conversion_aux.cmx
-${PLIST.native}lib/ocaml/compiler-libs/closure_conversion_aux.mli
-${PLIST.native}lib/ocaml/compiler-libs/closure_element.cmi
-${PLIST.native}lib/ocaml/compiler-libs/closure_element.cmt
-${PLIST.native}lib/ocaml/compiler-libs/closure_element.cmti
-${PLIST.native}lib/ocaml/compiler-libs/closure_element.cmx
-${PLIST.native}lib/ocaml/compiler-libs/closure_element.mli
-${PLIST.native}lib/ocaml/compiler-libs/closure_id.cmi
-${PLIST.native}lib/ocaml/compiler-libs/closure_id.cmt
-${PLIST.native}lib/ocaml/compiler-libs/closure_id.cmti
-${PLIST.native}lib/ocaml/compiler-libs/closure_id.cmx
-${PLIST.native}lib/ocaml/compiler-libs/closure_id.mli
-${PLIST.native}lib/ocaml/compiler-libs/closure_middle_end.cmi
-${PLIST.native}lib/ocaml/compiler-libs/closure_middle_end.cmt
-${PLIST.native}lib/ocaml/compiler-libs/closure_middle_end.cmti
-${PLIST.native}lib/ocaml/compiler-libs/closure_middle_end.cmx
-${PLIST.native}lib/ocaml/compiler-libs/closure_middle_end.mli
-${PLIST.native}lib/ocaml/compiler-libs/closure_offsets.cmi
-${PLIST.native}lib/ocaml/compiler-libs/closure_offsets.cmt
-${PLIST.native}lib/ocaml/compiler-libs/closure_offsets.cmti
-${PLIST.native}lib/ocaml/compiler-libs/closure_offsets.cmx
-${PLIST.native}lib/ocaml/compiler-libs/closure_offsets.mli
-${PLIST.native}lib/ocaml/compiler-libs/closure_origin.cmi
-${PLIST.native}lib/ocaml/compiler-libs/closure_origin.cmt
-${PLIST.native}lib/ocaml/compiler-libs/closure_origin.cmti
-${PLIST.native}lib/ocaml/compiler-libs/closure_origin.cmx
-${PLIST.native}lib/ocaml/compiler-libs/closure_origin.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
+${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
+${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
+${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
+${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
+${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
+${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
+${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/closure_origin.cmx
+${PLIST.ocaml-opt}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.native}lib/ocaml/compiler-libs/cmi_format.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmi_format.cmx
 lib/ocaml/compiler-libs/cmi_format.mli
-${PLIST.native}lib/ocaml/compiler-libs/cmm.cmi
-${PLIST.native}lib/ocaml/compiler-libs/cmm.cmt
-${PLIST.native}lib/ocaml/compiler-libs/cmm.cmti
-${PLIST.native}lib/ocaml/compiler-libs/cmm.cmx
-${PLIST.native}lib/ocaml/compiler-libs/cmm.mli
-${PLIST.native}lib/ocaml/compiler-libs/cmm_helpers.cmi
-${PLIST.native}lib/ocaml/compiler-libs/cmm_helpers.cmt
-${PLIST.native}lib/ocaml/compiler-libs/cmm_helpers.cmti
-${PLIST.native}lib/ocaml/compiler-libs/cmm_helpers.cmx
-${PLIST.native}lib/ocaml/compiler-libs/cmm_helpers.mli
-${PLIST.native}lib/ocaml/compiler-libs/cmm_invariants.cmi
-${PLIST.native}lib/ocaml/compiler-libs/cmm_invariants.cmt
-${PLIST.native}lib/ocaml/compiler-libs/cmm_invariants.cmti
-${PLIST.native}lib/ocaml/compiler-libs/cmm_invariants.cmx
-${PLIST.native}lib/ocaml/compiler-libs/cmm_invariants.mli
-${PLIST.native}lib/ocaml/compiler-libs/cmmgen.cmi
-${PLIST.native}lib/ocaml/compiler-libs/cmmgen.cmt
-${PLIST.native}lib/ocaml/compiler-libs/cmmgen.cmti
-${PLIST.native}lib/ocaml/compiler-libs/cmmgen.cmx
-${PLIST.native}lib/ocaml/compiler-libs/cmmgen.mli
-${PLIST.native}lib/ocaml/compiler-libs/cmmgen_state.cmi
-${PLIST.native}lib/ocaml/compiler-libs/cmmgen_state.cmt
-${PLIST.native}lib/ocaml/compiler-libs/cmmgen_state.cmti
-${PLIST.native}lib/ocaml/compiler-libs/cmmgen_state.cmx
-${PLIST.native}lib/ocaml/compiler-libs/cmmgen_state.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
+${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
+${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
+${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmmgen_state.mli
 lib/ocaml/compiler-libs/cmo_format.cmi
 lib/ocaml/compiler-libs/cmo_format.cmti
 lib/ocaml/compiler-libs/cmo_format.mli
 lib/ocaml/compiler-libs/cmt2annot.cmi
 lib/ocaml/compiler-libs/cmt2annot.cmt
-${PLIST.native}lib/ocaml/compiler-libs/cmt2annot.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmt2annot.cmx
 lib/ocaml/compiler-libs/cmt_format.cmi
 lib/ocaml/compiler-libs/cmt_format.cmt
 lib/ocaml/compiler-libs/cmt_format.cmti
-${PLIST.native}lib/ocaml/compiler-libs/cmt_format.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/cmt_format.cmx
 lib/ocaml/compiler-libs/cmt_format.mli
 lib/ocaml/compiler-libs/cmx_format.cmi
 lib/ocaml/compiler-libs/cmx_format.cmti
@@ -437,1098 +437,1098 @@ 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.native}lib/ocaml/compiler-libs/coloring.cmi
-${PLIST.native}lib/ocaml/compiler-libs/coloring.cmt
-${PLIST.native}lib/ocaml/compiler-libs/coloring.cmti
-${PLIST.native}lib/ocaml/compiler-libs/coloring.cmx
-${PLIST.native}lib/ocaml/compiler-libs/coloring.mli
-${PLIST.native}lib/ocaml/compiler-libs/comballoc.cmi
-${PLIST.native}lib/ocaml/compiler-libs/comballoc.cmt
-${PLIST.native}lib/ocaml/compiler-libs/comballoc.cmti
-${PLIST.native}lib/ocaml/compiler-libs/comballoc.cmx
-${PLIST.native}lib/ocaml/compiler-libs/comballoc.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
+${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/comballoc.cmx
+${PLIST.ocaml-opt}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.native}lib/ocaml/compiler-libs/compenv.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compenv.cmx
 lib/ocaml/compiler-libs/compenv.mli
-${PLIST.native}lib/ocaml/compiler-libs/compilation_unit.cmi
-${PLIST.native}lib/ocaml/compiler-libs/compilation_unit.cmt
-${PLIST.native}lib/ocaml/compiler-libs/compilation_unit.cmti
-${PLIST.native}lib/ocaml/compiler-libs/compilation_unit.cmx
-${PLIST.native}lib/ocaml/compiler-libs/compilation_unit.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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilation_unit.cmx
+${PLIST.ocaml-opt}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
-${PLIST.native}lib/ocaml/compiler-libs/compile.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compile.cmx
 lib/ocaml/compiler-libs/compile.mli
 lib/ocaml/compiler-libs/compile_common.cmi
 lib/ocaml/compiler-libs/compile_common.cmt
 lib/ocaml/compiler-libs/compile_common.cmti
-${PLIST.native}lib/ocaml/compiler-libs/compile_common.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compile_common.cmx
 lib/ocaml/compiler-libs/compile_common.mli
-${PLIST.native}lib/ocaml/compiler-libs/compilenv.cmi
-${PLIST.native}lib/ocaml/compiler-libs/compilenv.cmt
-${PLIST.native}lib/ocaml/compiler-libs/compilenv.cmti
-${PLIST.native}lib/ocaml/compiler-libs/compilenv.cmx
-${PLIST.native}lib/ocaml/compiler-libs/compilenv.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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compilenv.cmx
+${PLIST.ocaml-opt}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.native}lib/ocaml/compiler-libs/compmisc.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compmisc.cmx
 lib/ocaml/compiler-libs/compmisc.mli
 lib/ocaml/compiler-libs/config.cmi
 lib/ocaml/compiler-libs/config.cmt
 lib/ocaml/compiler-libs/config.cmti
-${PLIST.native}lib/ocaml/compiler-libs/config.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/config.cmx
 lib/ocaml/compiler-libs/config.mli
 lib/ocaml/compiler-libs/consistbl.cmi
 lib/ocaml/compiler-libs/consistbl.cmt
 lib/ocaml/compiler-libs/consistbl.cmti
-${PLIST.native}lib/ocaml/compiler-libs/consistbl.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/consistbl.cmx
 lib/ocaml/compiler-libs/consistbl.mli
-${PLIST.native}lib/ocaml/compiler-libs/convert_primitives.cmi
-${PLIST.native}lib/ocaml/compiler-libs/convert_primitives.cmt
-${PLIST.native}lib/ocaml/compiler-libs/convert_primitives.cmti
-${PLIST.native}lib/ocaml/compiler-libs/convert_primitives.cmx
-${PLIST.native}lib/ocaml/compiler-libs/convert_primitives.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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/convert_primitives.cmx
+${PLIST.ocaml-opt}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.native}lib/ocaml/compiler-libs/ctype.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ctype.cmx
 lib/ocaml/compiler-libs/ctype.mli
-${PLIST.native}lib/ocaml/compiler-libs/dataflow.cmi
-${PLIST.native}lib/ocaml/compiler-libs/dataflow.cmt
-${PLIST.native}lib/ocaml/compiler-libs/dataflow.cmti
-${PLIST.native}lib/ocaml/compiler-libs/dataflow.cmx
-${PLIST.native}lib/ocaml/compiler-libs/dataflow.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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/dataflow.cmx
+${PLIST.ocaml-opt}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.native}lib/ocaml/compiler-libs/datarepr.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/datarepr.cmx
 lib/ocaml/compiler-libs/datarepr.mli
-${PLIST.native}lib/ocaml/compiler-libs/deadcode.cmi
-${PLIST.native}lib/ocaml/compiler-libs/deadcode.cmt
-${PLIST.native}lib/ocaml/compiler-libs/deadcode.cmti
-${PLIST.native}lib/ocaml/compiler-libs/deadcode.cmx
-${PLIST.native}lib/ocaml/compiler-libs/deadcode.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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/deadcode.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/deadcode.mli
 lib/ocaml/compiler-libs/debuginfo.cmi
 lib/ocaml/compiler-libs/debuginfo.cmt
 lib/ocaml/compiler-libs/debuginfo.cmti
-${PLIST.native}lib/ocaml/compiler-libs/debuginfo.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/debuginfo.cmx
 lib/ocaml/compiler-libs/debuginfo.mli
 lib/ocaml/compiler-libs/depend.cmi
 lib/ocaml/compiler-libs/depend.cmt
 lib/ocaml/compiler-libs/depend.cmti
-${PLIST.native}lib/ocaml/compiler-libs/depend.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/depend.cmx
 lib/ocaml/compiler-libs/depend.mli
 lib/ocaml/compiler-libs/diffing.cmi
 lib/ocaml/compiler-libs/diffing.cmt
 lib/ocaml/compiler-libs/diffing.cmti
-${PLIST.native}lib/ocaml/compiler-libs/diffing.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/diffing.cmx
 lib/ocaml/compiler-libs/diffing.mli
 lib/ocaml/compiler-libs/diffing_with_keys.cmi
 lib/ocaml/compiler-libs/diffing_with_keys.cmt
 lib/ocaml/compiler-libs/diffing_with_keys.cmti
-${PLIST.native}lib/ocaml/compiler-libs/diffing_with_keys.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/diffing_with_keys.cmx
 lib/ocaml/compiler-libs/diffing_with_keys.mli
 lib/ocaml/compiler-libs/dll.cmi
 lib/ocaml/compiler-libs/dll.cmt
 lib/ocaml/compiler-libs/dll.cmti
-${PLIST.native}lib/ocaml/compiler-libs/dll.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/dll.cmx
 lib/ocaml/compiler-libs/dll.mli
 lib/ocaml/compiler-libs/docstrings.cmi
 lib/ocaml/compiler-libs/docstrings.cmt
 lib/ocaml/compiler-libs/docstrings.cmti
-${PLIST.native}lib/ocaml/compiler-libs/docstrings.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/docstrings.cmx
 lib/ocaml/compiler-libs/docstrings.mli
 lib/ocaml/compiler-libs/domainstate.cmi
 lib/ocaml/compiler-libs/domainstate.cmt
 lib/ocaml/compiler-libs/domainstate.cmti
-${PLIST.native}lib/ocaml/compiler-libs/domainstate.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/domainstate.cmx
 lib/ocaml/compiler-libs/domainstate.mli
-${PLIST.native}lib/ocaml/compiler-libs/effect_analysis.cmi
-${PLIST.native}lib/ocaml/compiler-libs/effect_analysis.cmt
-${PLIST.native}lib/ocaml/compiler-libs/effect_analysis.cmti
-${PLIST.native}lib/ocaml/compiler-libs/effect_analysis.cmx
-${PLIST.native}lib/ocaml/compiler-libs/effect_analysis.mli
-${PLIST.native}lib/ocaml/compiler-libs/emit.cmi
-${PLIST.native}lib/ocaml/compiler-libs/emit.cmt
-${PLIST.native}lib/ocaml/compiler-libs/emit.cmti
-${PLIST.native}lib/ocaml/compiler-libs/emit.cmx
-${PLIST.native}lib/ocaml/compiler-libs/emit.mli
-${PLIST.native}lib/ocaml/compiler-libs/emitaux.cmi
-${PLIST.native}lib/ocaml/compiler-libs/emitaux.cmt
-${PLIST.native}lib/ocaml/compiler-libs/emitaux.cmti
-${PLIST.native}lib/ocaml/compiler-libs/emitaux.cmx
-${PLIST.native}lib/ocaml/compiler-libs/emitaux.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
+${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
+${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emitaux.cmx
+${PLIST.ocaml-opt}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.native}lib/ocaml/compiler-libs/emitcode.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/emitcode.cmx
 lib/ocaml/compiler-libs/emitcode.mli
-${PLIST.native}lib/ocaml/compiler-libs/emitenv.cmi
-${PLIST.native}lib/ocaml/compiler-libs/emitenv.cmti
-${PLIST.native}lib/ocaml/compiler-libs/emitenv.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/env.cmi
 lib/ocaml/compiler-libs/env.cmt
 lib/ocaml/compiler-libs/env.cmti
-${PLIST.native}lib/ocaml/compiler-libs/env.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/env.cmx
 lib/ocaml/compiler-libs/env.mli
 lib/ocaml/compiler-libs/envaux.cmi
 lib/ocaml/compiler-libs/envaux.cmt
 lib/ocaml/compiler-libs/envaux.cmti
-${PLIST.native}lib/ocaml/compiler-libs/envaux.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/envaux.cmx
 lib/ocaml/compiler-libs/envaux.mli
 lib/ocaml/compiler-libs/errors.cmi
 lib/ocaml/compiler-libs/errors.cmt
 lib/ocaml/compiler-libs/errors.cmti
-${PLIST.native}lib/ocaml/compiler-libs/errors.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/errors.cmx
 lib/ocaml/compiler-libs/errors.mli
 lib/ocaml/compiler-libs/errortrace.cmi
 lib/ocaml/compiler-libs/errortrace.cmt
 lib/ocaml/compiler-libs/errortrace.cmti
-${PLIST.native}lib/ocaml/compiler-libs/errortrace.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/errortrace.cmx
 lib/ocaml/compiler-libs/errortrace.mli
-${PLIST.native}lib/ocaml/compiler-libs/export_id.cmi
-${PLIST.native}lib/ocaml/compiler-libs/export_id.cmt
-${PLIST.native}lib/ocaml/compiler-libs/export_id.cmti
-${PLIST.native}lib/ocaml/compiler-libs/export_id.cmx
-${PLIST.native}lib/ocaml/compiler-libs/export_id.mli
-${PLIST.native}lib/ocaml/compiler-libs/export_info.cmi
-${PLIST.native}lib/ocaml/compiler-libs/export_info.cmt
-${PLIST.native}lib/ocaml/compiler-libs/export_info.cmti
-${PLIST.native}lib/ocaml/compiler-libs/export_info.cmx
-${PLIST.native}lib/ocaml/compiler-libs/export_info.mli
-${PLIST.native}lib/ocaml/compiler-libs/export_info_for_pack.cmi
-${PLIST.native}lib/ocaml/compiler-libs/export_info_for_pack.cmt
-${PLIST.native}lib/ocaml/compiler-libs/export_info_for_pack.cmti
-${PLIST.native}lib/ocaml/compiler-libs/export_info_for_pack.cmx
-${PLIST.native}lib/ocaml/compiler-libs/export_info_for_pack.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
+${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
+${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
+${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/expunge.cmi
 lib/ocaml/compiler-libs/expunge.cmt
-${PLIST.native}lib/ocaml/compiler-libs/extract_projections.cmi
-${PLIST.native}lib/ocaml/compiler-libs/extract_projections.cmt
-${PLIST.native}lib/ocaml/compiler-libs/extract_projections.cmti
-${PLIST.native}lib/ocaml/compiler-libs/extract_projections.cmx
-${PLIST.native}lib/ocaml/compiler-libs/extract_projections.mli
-${PLIST.native}lib/ocaml/compiler-libs/find_recursive_functions.cmi
-${PLIST.native}lib/ocaml/compiler-libs/find_recursive_functions.cmt
-${PLIST.native}lib/ocaml/compiler-libs/find_recursive_functions.cmti
-${PLIST.native}lib/ocaml/compiler-libs/find_recursive_functions.cmx
-${PLIST.native}lib/ocaml/compiler-libs/find_recursive_functions.mli
-${PLIST.native}lib/ocaml/compiler-libs/flambda.cmi
-${PLIST.native}lib/ocaml/compiler-libs/flambda.cmt
-${PLIST.native}lib/ocaml/compiler-libs/flambda.cmti
-${PLIST.native}lib/ocaml/compiler-libs/flambda.cmx
-${PLIST.native}lib/ocaml/compiler-libs/flambda.mli
-${PLIST.native}lib/ocaml/compiler-libs/flambda_invariants.cmi
-${PLIST.native}lib/ocaml/compiler-libs/flambda_invariants.cmt
-${PLIST.native}lib/ocaml/compiler-libs/flambda_invariants.cmti
-${PLIST.native}lib/ocaml/compiler-libs/flambda_invariants.cmx
-${PLIST.native}lib/ocaml/compiler-libs/flambda_invariants.mli
-${PLIST.native}lib/ocaml/compiler-libs/flambda_iterators.cmi
-${PLIST.native}lib/ocaml/compiler-libs/flambda_iterators.cmt
-${PLIST.native}lib/ocaml/compiler-libs/flambda_iterators.cmti
-${PLIST.native}lib/ocaml/compiler-libs/flambda_iterators.cmx
-${PLIST.native}lib/ocaml/compiler-libs/flambda_iterators.mli
-${PLIST.native}lib/ocaml/compiler-libs/flambda_middle_end.cmi
-${PLIST.native}lib/ocaml/compiler-libs/flambda_middle_end.cmt
-${PLIST.native}lib/ocaml/compiler-libs/flambda_middle_end.cmti
-${PLIST.native}lib/ocaml/compiler-libs/flambda_middle_end.cmx
-${PLIST.native}lib/ocaml/compiler-libs/flambda_middle_end.mli
-${PLIST.native}lib/ocaml/compiler-libs/flambda_to_clambda.cmi
-${PLIST.native}lib/ocaml/compiler-libs/flambda_to_clambda.cmt
-${PLIST.native}lib/ocaml/compiler-libs/flambda_to_clambda.cmti
-${PLIST.native}lib/ocaml/compiler-libs/flambda_to_clambda.cmx
-${PLIST.native}lib/ocaml/compiler-libs/flambda_to_clambda.mli
-${PLIST.native}lib/ocaml/compiler-libs/flambda_utils.cmi
-${PLIST.native}lib/ocaml/compiler-libs/flambda_utils.cmt
-${PLIST.native}lib/ocaml/compiler-libs/flambda_utils.cmti
-${PLIST.native}lib/ocaml/compiler-libs/flambda_utils.cmx
-${PLIST.native}lib/ocaml/compiler-libs/flambda_utils.mli
-${PLIST.native}lib/ocaml/compiler-libs/freshening.cmi
-${PLIST.native}lib/ocaml/compiler-libs/freshening.cmt
-${PLIST.native}lib/ocaml/compiler-libs/freshening.cmti
-${PLIST.native}lib/ocaml/compiler-libs/freshening.cmx
-${PLIST.native}lib/ocaml/compiler-libs/freshening.mli
+${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
+${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
+${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
+${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
+${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_iterators.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_iterators.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_middle_end.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_middle_end.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_middle_end.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_middle_end.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_middle_end.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_to_clambda.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_to_clambda.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/flambda_to_clambda.cmti
+${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
+${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/freshening.cmx
+${PLIST.ocaml-opt}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.native}lib/ocaml/compiler-libs/genprintval.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/genprintval.cmx
 lib/ocaml/compiler-libs/genprintval.mli
-${PLIST.native}lib/ocaml/compiler-libs/id_types.cmi
-${PLIST.native}lib/ocaml/compiler-libs/id_types.cmt
-${PLIST.native}lib/ocaml/compiler-libs/id_types.cmti
-${PLIST.native}lib/ocaml/compiler-libs/id_types.cmx
-${PLIST.native}lib/ocaml/compiler-libs/id_types.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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/id_types.cmx
+${PLIST.ocaml-opt}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
-${PLIST.native}lib/ocaml/compiler-libs/ident.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ident.cmx
 lib/ocaml/compiler-libs/ident.mli
 lib/ocaml/compiler-libs/identifiable.cmi
 lib/ocaml/compiler-libs/identifiable.cmt
 lib/ocaml/compiler-libs/identifiable.cmti
-${PLIST.native}lib/ocaml/compiler-libs/identifiable.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/identifiable.cmx
 lib/ocaml/compiler-libs/identifiable.mli
-${PLIST.native}lib/ocaml/compiler-libs/import_approx.cmi
-${PLIST.native}lib/ocaml/compiler-libs/import_approx.cmt
-${PLIST.native}lib/ocaml/compiler-libs/import_approx.cmti
-${PLIST.native}lib/ocaml/compiler-libs/import_approx.cmx
-${PLIST.native}lib/ocaml/compiler-libs/import_approx.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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/import_approx.cmx
+${PLIST.ocaml-opt}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
-${PLIST.native}lib/ocaml/compiler-libs/includeclass.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/includeclass.cmx
 lib/ocaml/compiler-libs/includeclass.mli
 lib/ocaml/compiler-libs/includecore.cmi
 lib/ocaml/compiler-libs/includecore.cmt
 lib/ocaml/compiler-libs/includecore.cmti
-${PLIST.native}lib/ocaml/compiler-libs/includecore.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/includecore.cmx
 lib/ocaml/compiler-libs/includecore.mli
 lib/ocaml/compiler-libs/includemod.cmi
 lib/ocaml/compiler-libs/includemod.cmt
 lib/ocaml/compiler-libs/includemod.cmti
-${PLIST.native}lib/ocaml/compiler-libs/includemod.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/includemod.cmx
 lib/ocaml/compiler-libs/includemod.mli
 lib/ocaml/compiler-libs/includemod_errorprinter.cmi
 lib/ocaml/compiler-libs/includemod_errorprinter.cmt
 lib/ocaml/compiler-libs/includemod_errorprinter.cmti
-${PLIST.native}lib/ocaml/compiler-libs/includemod_errorprinter.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/includemod_errorprinter.cmx
 lib/ocaml/compiler-libs/includemod_errorprinter.mli
-${PLIST.native}lib/ocaml/compiler-libs/inconstant_idents.cmi
-${PLIST.native}lib/ocaml/compiler-libs/inconstant_idents.cmt
-${PLIST.native}lib/ocaml/compiler-libs/inconstant_idents.cmti
-${PLIST.native}lib/ocaml/compiler-libs/inconstant_idents.cmx
-${PLIST.native}lib/ocaml/compiler-libs/inconstant_idents.mli
-${PLIST.native}lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmi
-${PLIST.native}lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmt
-${PLIST.native}lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmti
-${PLIST.native}lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.cmx
-${PLIST.native}lib/ocaml/compiler-libs/initialize_symbol_to_let_symbol.mli
-${PLIST.native}lib/ocaml/compiler-libs/inline_and_simplify.cmi
-${PLIST.native}lib/ocaml/compiler-libs/inline_and_simplify.cmt
-${PLIST.native}lib/ocaml/compiler-libs/inline_and_simplify.cmti
-${PLIST.native}lib/ocaml/compiler-libs/inline_and_simplify.cmx
-${PLIST.native}lib/ocaml/compiler-libs/inline_and_simplify.mli
-${PLIST.native}lib/ocaml/compiler-libs/inline_and_simplify_aux.cmi
-${PLIST.native}lib/ocaml/compiler-libs/inline_and_simplify_aux.cmt
-${PLIST.native}lib/ocaml/compiler-libs/inline_and_simplify_aux.cmti
-${PLIST.native}lib/ocaml/compiler-libs/inline_and_simplify_aux.cmx
-${PLIST.native}lib/ocaml/compiler-libs/inline_and_simplify_aux.mli
-${PLIST.native}lib/ocaml/compiler-libs/inlining_cost.cmi
-${PLIST.native}lib/ocaml/compiler-libs/inlining_cost.cmt
-${PLIST.native}lib/ocaml/compiler-libs/inlining_cost.cmti
-${PLIST.native}lib/ocaml/compiler-libs/inlining_cost.cmx
-${PLIST.native}lib/ocaml/compiler-libs/inlining_cost.mli
-${PLIST.native}lib/ocaml/compiler-libs/inlining_decision.cmi
-${PLIST.native}lib/ocaml/compiler-libs/inlining_decision.cmt
-${PLIST.native}lib/ocaml/compiler-libs/inlining_decision.cmti
-${PLIST.native}lib/ocaml/compiler-libs/inlining_decision.cmx
-${PLIST.native}lib/ocaml/compiler-libs/inlining_decision.mli
-${PLIST.native}lib/ocaml/compiler-libs/inlining_decision_intf.cmi
-${PLIST.native}lib/ocaml/compiler-libs/inlining_decision_intf.cmti
-${PLIST.native}lib/ocaml/compiler-libs/inlining_decision_intf.mli
-${PLIST.native}lib/ocaml/compiler-libs/inlining_stats.cmi
-${PLIST.native}lib/ocaml/compiler-libs/inlining_stats.cmt
-${PLIST.native}lib/ocaml/compiler-libs/inlining_stats.cmti
-${PLIST.native}lib/ocaml/compiler-libs/inlining_stats.cmx
-${PLIST.native}lib/ocaml/compiler-libs/inlining_stats.mli
-${PLIST.native}lib/ocaml/compiler-libs/inlining_stats_types.cmi
-${PLIST.native}lib/ocaml/compiler-libs/inlining_stats_types.cmt
-${PLIST.native}lib/ocaml/compiler-libs/inlining_stats_types.cmti
-${PLIST.native}lib/ocaml/compiler-libs/inlining_stats_types.cmx
-${PLIST.native}lib/ocaml/compiler-libs/inlining_stats_types.mli
-${PLIST.native}lib/ocaml/compiler-libs/inlining_transforms.cmi
-${PLIST.native}lib/ocaml/compiler-libs/inlining_transforms.cmt
-${PLIST.native}lib/ocaml/compiler-libs/inlining_transforms.cmti
-${PLIST.native}lib/ocaml/compiler-libs/inlining_transforms.cmx
-${PLIST.native}lib/ocaml/compiler-libs/inlining_transforms.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
+${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
+${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
+${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
+${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
+${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
+${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
+${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
+${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/inlining_transforms.cmx
+${PLIST.ocaml-opt}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
-${PLIST.native}lib/ocaml/compiler-libs/instruct.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/instruct.cmx
 lib/ocaml/compiler-libs/instruct.mli
 lib/ocaml/compiler-libs/int_replace_polymorphic_compare.cmi
 lib/ocaml/compiler-libs/int_replace_polymorphic_compare.cmt
 lib/ocaml/compiler-libs/int_replace_polymorphic_compare.cmti
-${PLIST.native}lib/ocaml/compiler-libs/int_replace_polymorphic_compare.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/int_replace_polymorphic_compare.cmx
 lib/ocaml/compiler-libs/int_replace_polymorphic_compare.mli
-${PLIST.native}lib/ocaml/compiler-libs/interf.cmi
-${PLIST.native}lib/ocaml/compiler-libs/interf.cmt
-${PLIST.native}lib/ocaml/compiler-libs/interf.cmti
-${PLIST.native}lib/ocaml/compiler-libs/interf.cmx
-${PLIST.native}lib/ocaml/compiler-libs/interf.mli
-${PLIST.native}lib/ocaml/compiler-libs/internal_variable_names.cmi
-${PLIST.native}lib/ocaml/compiler-libs/internal_variable_names.cmt
-${PLIST.native}lib/ocaml/compiler-libs/internal_variable_names.cmti
-${PLIST.native}lib/ocaml/compiler-libs/internal_variable_names.cmx
-${PLIST.native}lib/ocaml/compiler-libs/internal_variable_names.mli
-${PLIST.native}lib/ocaml/compiler-libs/interval.cmi
-${PLIST.native}lib/ocaml/compiler-libs/interval.cmt
-${PLIST.native}lib/ocaml/compiler-libs/interval.cmti
-${PLIST.native}lib/ocaml/compiler-libs/interval.cmx
-${PLIST.native}lib/ocaml/compiler-libs/interval.mli
-${PLIST.native}lib/ocaml/compiler-libs/invariant_params.cmi
-${PLIST.native}lib/ocaml/compiler-libs/invariant_params.cmt
-${PLIST.native}lib/ocaml/compiler-libs/invariant_params.cmti
-${PLIST.native}lib/ocaml/compiler-libs/invariant_params.cmx
-${PLIST.native}lib/ocaml/compiler-libs/invariant_params.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
+${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
+${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
+${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/invariant_params.cmx
+${PLIST.ocaml-opt}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
-${PLIST.native}lib/ocaml/compiler-libs/lambda.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lambda.cmx
 lib/ocaml/compiler-libs/lambda.mli
 lib/ocaml/compiler-libs/lazy_backtrack.cmi
 lib/ocaml/compiler-libs/lazy_backtrack.cmt
 lib/ocaml/compiler-libs/lazy_backtrack.cmti
-${PLIST.native}lib/ocaml/compiler-libs/lazy_backtrack.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lazy_backtrack.cmx
 lib/ocaml/compiler-libs/lazy_backtrack.mli
 lib/ocaml/compiler-libs/lexer.cmi
 lib/ocaml/compiler-libs/lexer.cmt
 lib/ocaml/compiler-libs/lexer.cmti
-${PLIST.native}lib/ocaml/compiler-libs/lexer.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/lexer.cmx
 lib/ocaml/compiler-libs/lexer.mli
-${PLIST.native}lib/ocaml/compiler-libs/lift_code.cmi
-${PLIST.native}lib/ocaml/compiler-libs/lift_code.cmt
-${PLIST.native}lib/ocaml/compiler-libs/lift_code.cmti
-${PLIST.native}lib/ocaml/compiler-libs/lift_code.cmx
-${PLIST.native}lib/ocaml/compiler-libs/lift_code.mli
-${PLIST.native}lib/ocaml/compiler-libs/lift_constants.cmi
-${PLIST.native}lib/ocaml/compiler-libs/lift_constants.cmt
-${PLIST.native}lib/ocaml/compiler-libs/lift_constants.cmti
-${PLIST.native}lib/ocaml/compiler-libs/lift_constants.cmx
-${PLIST.native}lib/ocaml/compiler-libs/lift_constants.mli
-${PLIST.native}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmi
-${PLIST.native}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmt
-${PLIST.native}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmti
-${PLIST.native}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmx
-${PLIST.native}lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.mli
-${PLIST.native}lib/ocaml/compiler-libs/linear.cmi
-${PLIST.native}lib/ocaml/compiler-libs/linear.cmt
-${PLIST.native}lib/ocaml/compiler-libs/linear.cmti
-${PLIST.native}lib/ocaml/compiler-libs/linear.cmx
-${PLIST.native}lib/ocaml/compiler-libs/linear.mli
-${PLIST.native}lib/ocaml/compiler-libs/linear_format.cmi
-${PLIST.native}lib/ocaml/compiler-libs/linear_format.cmt
-${PLIST.native}lib/ocaml/compiler-libs/linear_format.cmti
-${PLIST.native}lib/ocaml/compiler-libs/linear_format.cmx
+${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
+${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
+${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
+${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
+${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear_format.cmx
 lib/ocaml/compiler-libs/linear_format.mli
-${PLIST.native}lib/ocaml/compiler-libs/linearize.cmi
-${PLIST.native}lib/ocaml/compiler-libs/linearize.cmt
-${PLIST.native}lib/ocaml/compiler-libs/linearize.cmti
-${PLIST.native}lib/ocaml/compiler-libs/linearize.cmx
-${PLIST.native}lib/ocaml/compiler-libs/linearize.mli
-${PLIST.native}lib/ocaml/compiler-libs/linkage_name.cmi
-${PLIST.native}lib/ocaml/compiler-libs/linkage_name.cmt
-${PLIST.native}lib/ocaml/compiler-libs/linkage_name.cmti
-${PLIST.native}lib/ocaml/compiler-libs/linkage_name.cmx
-${PLIST.native}lib/ocaml/compiler-libs/linkage_name.mli
-${PLIST.native}lib/ocaml/compiler-libs/linscan.cmi
-${PLIST.native}lib/ocaml/compiler-libs/linscan.cmt
-${PLIST.native}lib/ocaml/compiler-libs/linscan.cmti
-${PLIST.native}lib/ocaml/compiler-libs/linscan.cmx
-${PLIST.native}lib/ocaml/compiler-libs/linscan.mli
-${PLIST.native}lib/ocaml/compiler-libs/liveness.cmi
-${PLIST.native}lib/ocaml/compiler-libs/liveness.cmt
-${PLIST.native}lib/ocaml/compiler-libs/liveness.cmti
-${PLIST.native}lib/ocaml/compiler-libs/liveness.cmx
-${PLIST.native}lib/ocaml/compiler-libs/liveness.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
+${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
+${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
+${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/liveness.cmx
+${PLIST.ocaml-opt}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
-${PLIST.native}lib/ocaml/compiler-libs/load_path.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/load_path.cmx
 lib/ocaml/compiler-libs/load_path.mli
 lib/ocaml/compiler-libs/local_store.cmi
 lib/ocaml/compiler-libs/local_store.cmt
 lib/ocaml/compiler-libs/local_store.cmti
-${PLIST.native}lib/ocaml/compiler-libs/local_store.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/local_store.cmx
 lib/ocaml/compiler-libs/local_store.mli
 lib/ocaml/compiler-libs/location.cmi
 lib/ocaml/compiler-libs/location.cmt
 lib/ocaml/compiler-libs/location.cmti
-${PLIST.native}lib/ocaml/compiler-libs/location.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/location.cmx
 lib/ocaml/compiler-libs/location.mli
 lib/ocaml/compiler-libs/longident.cmi
 lib/ocaml/compiler-libs/longident.cmt
 lib/ocaml/compiler-libs/longident.cmti
-${PLIST.native}lib/ocaml/compiler-libs/longident.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/longident.cmx
 lib/ocaml/compiler-libs/longident.mli
-${PLIST.native}lib/ocaml/compiler-libs/mach.cmi
-${PLIST.native}lib/ocaml/compiler-libs/mach.cmt
-${PLIST.native}lib/ocaml/compiler-libs/mach.cmti
-${PLIST.native}lib/ocaml/compiler-libs/mach.cmx
-${PLIST.native}lib/ocaml/compiler-libs/mach.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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mach.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mach.mli
 lib/ocaml/compiler-libs/main.cmi
 lib/ocaml/compiler-libs/main.cmo
 lib/ocaml/compiler-libs/main.cmt
-${PLIST.native}lib/ocaml/compiler-libs/main.cmx
-${PLIST.native}lib/ocaml/compiler-libs/main.o
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/main.cmx
+${PLIST.ocaml-opt}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
-${PLIST.native}lib/ocaml/compiler-libs/main_args.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/main_args.cmx
 lib/ocaml/compiler-libs/main_args.mli
 lib/ocaml/compiler-libs/maindriver.cmi
 lib/ocaml/compiler-libs/maindriver.cmt
 lib/ocaml/compiler-libs/maindriver.cmti
-${PLIST.native}lib/ocaml/compiler-libs/maindriver.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/maindriver.cmx
 lib/ocaml/compiler-libs/maindriver.mli
 lib/ocaml/compiler-libs/makedepend.cmi
 lib/ocaml/compiler-libs/makedepend.cmt
 lib/ocaml/compiler-libs/makedepend.cmti
-${PLIST.native}lib/ocaml/compiler-libs/makedepend.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/makedepend.cmx
 lib/ocaml/compiler-libs/makedepend.mli
 lib/ocaml/compiler-libs/matching.cmi
 lib/ocaml/compiler-libs/matching.cmt
 lib/ocaml/compiler-libs/matching.cmti
-${PLIST.native}lib/ocaml/compiler-libs/matching.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/matching.cmx
 lib/ocaml/compiler-libs/matching.mli
 lib/ocaml/compiler-libs/meta.cmi
 lib/ocaml/compiler-libs/meta.cmt
 lib/ocaml/compiler-libs/meta.cmti
-${PLIST.native}lib/ocaml/compiler-libs/meta.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/meta.cmx
 lib/ocaml/compiler-libs/meta.mli
 lib/ocaml/compiler-libs/misc.cmi
 lib/ocaml/compiler-libs/misc.cmt
 lib/ocaml/compiler-libs/misc.cmti
-${PLIST.native}lib/ocaml/compiler-libs/misc.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/misc.cmx
 lib/ocaml/compiler-libs/misc.mli
 lib/ocaml/compiler-libs/mtype.cmi
 lib/ocaml/compiler-libs/mtype.cmt
 lib/ocaml/compiler-libs/mtype.cmti
-${PLIST.native}lib/ocaml/compiler-libs/mtype.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mtype.cmx
 lib/ocaml/compiler-libs/mtype.mli
-${PLIST.native}lib/ocaml/compiler-libs/mutable_variable.cmi
-${PLIST.native}lib/ocaml/compiler-libs/mutable_variable.cmt
-${PLIST.native}lib/ocaml/compiler-libs/mutable_variable.cmti
-${PLIST.native}lib/ocaml/compiler-libs/mutable_variable.cmx
-${PLIST.native}lib/ocaml/compiler-libs/mutable_variable.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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/mutable_variable.cmx
+${PLIST.ocaml-opt}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.native}lib/ocaml/compiler-libs/numbers.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/numbers.cmx
 lib/ocaml/compiler-libs/numbers.mli
-${PLIST.native}lib/ocaml/compiler-libs/ocamlbytecomp.a
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlbytecomp.a
 lib/ocaml/compiler-libs/ocamlbytecomp.cma
-${PLIST.native}lib/ocaml/compiler-libs/ocamlbytecomp.cmxa
-${PLIST.native}lib/ocaml/compiler-libs/ocamlcommon.a
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlbytecomp.cmxa
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlcommon.a
 lib/ocaml/compiler-libs/ocamlcommon.cma
-${PLIST.native}lib/ocaml/compiler-libs/ocamlcommon.cmxa
-${PLIST.native}lib/ocaml/compiler-libs/ocamlmiddleend.a
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlcommon.cmxa
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamlmiddleend.a
 lib/ocaml/compiler-libs/ocamlmiddleend.cma
-${PLIST.native}lib/ocaml/compiler-libs/ocamlmiddleend.cmxa
-${PLIST.native}lib/ocaml/compiler-libs/ocamloptcomp.a
-${PLIST.native}lib/ocaml/compiler-libs/ocamloptcomp.cma
-${PLIST.native}lib/ocaml/compiler-libs/ocamloptcomp.cmxa
-${PLIST.native}lib/ocaml/compiler-libs/ocamltoplevel.a
+${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/ocamltoplevel.cma
-${PLIST.native}${PLIST.native}lib/ocaml/compiler-libs/ocamltoplevel.cmxa
+${PLIST.ocaml-opt}${PLIST.ocaml-opt}lib/ocaml/compiler-libs/ocamltoplevel.cmxa
 lib/ocaml/compiler-libs/opcodes.cmi
 lib/ocaml/compiler-libs/opcodes.cmt
 lib/ocaml/compiler-libs/opcodes.cmti
-${PLIST.native}lib/ocaml/compiler-libs/opcodes.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/opcodes.cmx
 lib/ocaml/compiler-libs/opcodes.mli
 lib/ocaml/compiler-libs/oprint.cmi
 lib/ocaml/compiler-libs/oprint.cmt
 lib/ocaml/compiler-libs/oprint.cmti
-${PLIST.native}lib/ocaml/compiler-libs/oprint.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/oprint.cmx
 lib/ocaml/compiler-libs/oprint.mli
-${PLIST.native}lib/ocaml/compiler-libs/optcompile.cmi
-${PLIST.native}lib/ocaml/compiler-libs/optcompile.cmt
-${PLIST.native}lib/ocaml/compiler-libs/optcompile.cmti
-${PLIST.native}lib/ocaml/compiler-libs/optcompile.cmx
+${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optcompile.cmx
 lib/ocaml/compiler-libs/optcompile.mli
-${PLIST.native}lib/ocaml/compiler-libs/opterrors.cmi
-${PLIST.native}lib/ocaml/compiler-libs/opterrors.cmt
-${PLIST.native}lib/ocaml/compiler-libs/opterrors.cmti
-${PLIST.native}lib/ocaml/compiler-libs/opterrors.cmx
+${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/opterrors.cmx
 lib/ocaml/compiler-libs/opterrors.mli
-${PLIST.native}lib/ocaml/compiler-libs/optmain.cmi
-${PLIST.native}lib/ocaml/compiler-libs/optmain.cmo
-${PLIST.native}lib/ocaml/compiler-libs/optmain.cmt
-${PLIST.native}lib/ocaml/compiler-libs/optmain.cmx
-${PLIST.native}lib/ocaml/compiler-libs/optmain.o
-${PLIST.native}lib/ocaml/compiler-libs/optmaindriver.cmi
-${PLIST.native}lib/ocaml/compiler-libs/optmaindriver.cmt
-${PLIST.native}lib/ocaml/compiler-libs/optmaindriver.cmti
-${PLIST.native}lib/ocaml/compiler-libs/optmaindriver.cmx
+${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
+${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
+${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.native}lib/ocaml/compiler-libs/parameter.cmi
-${PLIST.native}lib/ocaml/compiler-libs/parameter.cmt
-${PLIST.native}lib/ocaml/compiler-libs/parameter.cmti
-${PLIST.native}lib/ocaml/compiler-libs/parameter.cmx
-${PLIST.native}lib/ocaml/compiler-libs/parameter.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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/parameter.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/parameter.mli
 lib/ocaml/compiler-libs/parmatch.cmi
 lib/ocaml/compiler-libs/parmatch.cmt
 lib/ocaml/compiler-libs/parmatch.cmti
-${PLIST.native}lib/ocaml/compiler-libs/parmatch.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/parmatch.cmx
 lib/ocaml/compiler-libs/parmatch.mli
 lib/ocaml/compiler-libs/parse.cmi
 lib/ocaml/compiler-libs/parse.cmt
 lib/ocaml/compiler-libs/parse.cmti
-${PLIST.native}lib/ocaml/compiler-libs/parse.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/parse.cmx
 lib/ocaml/compiler-libs/parse.mli
 lib/ocaml/compiler-libs/parser.cmi
 lib/ocaml/compiler-libs/parser.cmt
 lib/ocaml/compiler-libs/parser.cmti
-${PLIST.native}lib/ocaml/compiler-libs/parser.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/parser.cmx
 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.native}lib/ocaml/compiler-libs/pass_wrapper.cmi
-${PLIST.native}lib/ocaml/compiler-libs/pass_wrapper.cmt
-${PLIST.native}lib/ocaml/compiler-libs/pass_wrapper.cmti
-${PLIST.native}lib/ocaml/compiler-libs/pass_wrapper.cmx
-${PLIST.native}lib/ocaml/compiler-libs/pass_wrapper.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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/pass_wrapper.cmx
+${PLIST.ocaml-opt}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
-${PLIST.native}lib/ocaml/compiler-libs/path.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/path.cmx
 lib/ocaml/compiler-libs/path.mli
 lib/ocaml/compiler-libs/patterns.cmi
 lib/ocaml/compiler-libs/patterns.cmt
 lib/ocaml/compiler-libs/patterns.cmti
-${PLIST.native}lib/ocaml/compiler-libs/patterns.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/patterns.cmx
 lib/ocaml/compiler-libs/patterns.mli
 lib/ocaml/compiler-libs/persistent_env.cmi
 lib/ocaml/compiler-libs/persistent_env.cmt
 lib/ocaml/compiler-libs/persistent_env.cmti
-${PLIST.native}lib/ocaml/compiler-libs/persistent_env.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/persistent_env.cmx
 lib/ocaml/compiler-libs/persistent_env.mli
-${PLIST.native}lib/ocaml/compiler-libs/polling.cmi
-${PLIST.native}lib/ocaml/compiler-libs/polling.cmt
-${PLIST.native}lib/ocaml/compiler-libs/polling.cmti
-${PLIST.native}lib/ocaml/compiler-libs/polling.cmx
-${PLIST.native}lib/ocaml/compiler-libs/polling.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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/polling.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/polling.mli
 lib/ocaml/compiler-libs/pparse.cmi
 lib/ocaml/compiler-libs/pparse.cmt
 lib/ocaml/compiler-libs/pparse.cmti
-${PLIST.native}lib/ocaml/compiler-libs/pparse.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/pparse.cmx
 lib/ocaml/compiler-libs/pparse.mli
 lib/ocaml/compiler-libs/pprintast.cmi
 lib/ocaml/compiler-libs/pprintast.cmt
 lib/ocaml/compiler-libs/pprintast.cmti
-${PLIST.native}lib/ocaml/compiler-libs/pprintast.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/pprintast.cmx
 lib/ocaml/compiler-libs/pprintast.mli
 lib/ocaml/compiler-libs/predef.cmi
 lib/ocaml/compiler-libs/predef.cmt
 lib/ocaml/compiler-libs/predef.cmti
-${PLIST.native}lib/ocaml/compiler-libs/predef.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/predef.cmx
 lib/ocaml/compiler-libs/predef.mli
 lib/ocaml/compiler-libs/primitive.cmi
 lib/ocaml/compiler-libs/primitive.cmt
 lib/ocaml/compiler-libs/primitive.cmti
-${PLIST.native}lib/ocaml/compiler-libs/primitive.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/primitive.cmx
 lib/ocaml/compiler-libs/primitive.mli
 lib/ocaml/compiler-libs/printast.cmi
 lib/ocaml/compiler-libs/printast.cmt
 lib/ocaml/compiler-libs/printast.cmti
-${PLIST.native}lib/ocaml/compiler-libs/printast.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printast.cmx
 lib/ocaml/compiler-libs/printast.mli
-${PLIST.native}lib/ocaml/compiler-libs/printclambda.cmi
-${PLIST.native}lib/ocaml/compiler-libs/printclambda.cmt
-${PLIST.native}lib/ocaml/compiler-libs/printclambda.cmti
-${PLIST.native}lib/ocaml/compiler-libs/printclambda.cmx
-${PLIST.native}lib/ocaml/compiler-libs/printclambda.mli
-${PLIST.native}lib/ocaml/compiler-libs/printclambda_primitives.cmi
-${PLIST.native}lib/ocaml/compiler-libs/printclambda_primitives.cmt
-${PLIST.native}lib/ocaml/compiler-libs/printclambda_primitives.cmti
-${PLIST.native}lib/ocaml/compiler-libs/printclambda_primitives.cmx
-${PLIST.native}lib/ocaml/compiler-libs/printclambda_primitives.mli
-${PLIST.native}lib/ocaml/compiler-libs/printcmm.cmi
-${PLIST.native}lib/ocaml/compiler-libs/printcmm.cmt
-${PLIST.native}lib/ocaml/compiler-libs/printcmm.cmti
-${PLIST.native}lib/ocaml/compiler-libs/printcmm.cmx
-${PLIST.native}lib/ocaml/compiler-libs/printcmm.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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda_primitives.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda_primitives.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda_primitives.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda_primitives.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printclambda_primitives.mli
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printcmm.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printcmm.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printcmm.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printcmm.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printcmm.mli
 lib/ocaml/compiler-libs/printinstr.cmi
 lib/ocaml/compiler-libs/printinstr.cmt
 lib/ocaml/compiler-libs/printinstr.cmti
-${PLIST.native}lib/ocaml/compiler-libs/printinstr.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printinstr.cmx
 lib/ocaml/compiler-libs/printinstr.mli
 lib/ocaml/compiler-libs/printlambda.cmi
 lib/ocaml/compiler-libs/printlambda.cmt
 lib/ocaml/compiler-libs/printlambda.cmti
-${PLIST.native}lib/ocaml/compiler-libs/printlambda.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printlambda.cmx
 lib/ocaml/compiler-libs/printlambda.mli
-${PLIST.native}lib/ocaml/compiler-libs/printlinear.cmi
-${PLIST.native}lib/ocaml/compiler-libs/printlinear.cmt
-${PLIST.native}lib/ocaml/compiler-libs/printlinear.cmti
-${PLIST.native}lib/ocaml/compiler-libs/printlinear.cmx
-${PLIST.native}lib/ocaml/compiler-libs/printlinear.mli
-${PLIST.native}lib/ocaml/compiler-libs/printmach.cmi
-${PLIST.native}lib/ocaml/compiler-libs/printmach.cmt
-${PLIST.native}lib/ocaml/compiler-libs/printmach.cmti
-${PLIST.native}lib/ocaml/compiler-libs/printmach.cmx
-${PLIST.native}lib/ocaml/compiler-libs/printmach.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
+${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printmach.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printmach.mli
 lib/ocaml/compiler-libs/printpat.cmi
 lib/ocaml/compiler-libs/printpat.cmt
 lib/ocaml/compiler-libs/printpat.cmti
-${PLIST.native}lib/ocaml/compiler-libs/printpat.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printpat.cmx
 lib/ocaml/compiler-libs/printpat.mli
 lib/ocaml/compiler-libs/printtyp.cmi
 lib/ocaml/compiler-libs/printtyp.cmt
 lib/ocaml/compiler-libs/printtyp.cmti
-${PLIST.native}lib/ocaml/compiler-libs/printtyp.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printtyp.cmx
 lib/ocaml/compiler-libs/printtyp.mli
 lib/ocaml/compiler-libs/printtyped.cmi
 lib/ocaml/compiler-libs/printtyped.cmt
 lib/ocaml/compiler-libs/printtyped.cmti
-${PLIST.native}lib/ocaml/compiler-libs/printtyped.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/printtyped.cmx
 lib/ocaml/compiler-libs/printtyped.mli
-${PLIST.native}lib/ocaml/compiler-libs/proc.cmi
-${PLIST.native}lib/ocaml/compiler-libs/proc.cmt
-${PLIST.native}lib/ocaml/compiler-libs/proc.cmti
-${PLIST.native}lib/ocaml/compiler-libs/proc.cmx
-${PLIST.native}lib/ocaml/compiler-libs/proc.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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/proc.cmx
+${PLIST.ocaml-opt}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.native}lib/ocaml/compiler-libs/profile.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/profile.cmx
 lib/ocaml/compiler-libs/profile.mli
-${PLIST.native}lib/ocaml/compiler-libs/projection.cmi
-${PLIST.native}lib/ocaml/compiler-libs/projection.cmt
-${PLIST.native}lib/ocaml/compiler-libs/projection.cmti
-${PLIST.native}lib/ocaml/compiler-libs/projection.cmx
-${PLIST.native}lib/ocaml/compiler-libs/projection.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
+${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.native}lib/ocaml/compiler-libs/rec_check.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/rec_check.cmx
 lib/ocaml/compiler-libs/rec_check.mli
-${PLIST.native}lib/ocaml/compiler-libs/ref_to_variables.cmi
-${PLIST.native}lib/ocaml/compiler-libs/ref_to_variables.cmt
-${PLIST.native}lib/ocaml/compiler-libs/ref_to_variables.cmti
-${PLIST.native}lib/ocaml/compiler-libs/ref_to_variables.cmx
-${PLIST.native}lib/ocaml/compiler-libs/ref_to_variables.mli
-${PLIST.native}lib/ocaml/compiler-libs/reg.cmi
-${PLIST.native}lib/ocaml/compiler-libs/reg.cmt
-${PLIST.native}lib/ocaml/compiler-libs/reg.cmti
-${PLIST.native}lib/ocaml/compiler-libs/reg.cmx
-${PLIST.native}lib/ocaml/compiler-libs/reg.mli
-${PLIST.native}lib/ocaml/compiler-libs/reload.cmi
-${PLIST.native}lib/ocaml/compiler-libs/reload.cmt
-${PLIST.native}lib/ocaml/compiler-libs/reload.cmti
-${PLIST.native}lib/ocaml/compiler-libs/reload.cmx
-${PLIST.native}lib/ocaml/compiler-libs/reload.mli
-${PLIST.native}lib/ocaml/compiler-libs/reloadgen.cmi
-${PLIST.native}lib/ocaml/compiler-libs/reloadgen.cmt
-${PLIST.native}lib/ocaml/compiler-libs/reloadgen.cmti
-${PLIST.native}lib/ocaml/compiler-libs/reloadgen.cmx
-${PLIST.native}lib/ocaml/compiler-libs/reloadgen.mli
-${PLIST.native}lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmi
-${PLIST.native}lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmt
-${PLIST.native}lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmti
-${PLIST.native}lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.cmx
-${PLIST.native}lib/ocaml/compiler-libs/remove_free_vars_equal_to_args.mli
-${PLIST.native}lib/ocaml/compiler-libs/remove_unused_arguments.cmi
-${PLIST.native}lib/ocaml/compiler-libs/remove_unused_arguments.cmt
-${PLIST.native}lib/ocaml/compiler-libs/remove_unused_arguments.cmti
-${PLIST.native}lib/ocaml/compiler-libs/remove_unused_arguments.cmx
-${PLIST.native}lib/ocaml/compiler-libs/remove_unused_arguments.mli
-${PLIST.native}lib/ocaml/compiler-libs/remove_unused_closure_vars.cmi
-${PLIST.native}lib/ocaml/compiler-libs/remove_unused_closure_vars.cmt
-${PLIST.native}lib/ocaml/compiler-libs/remove_unused_closure_vars.cmti
-${PLIST.native}lib/ocaml/compiler-libs/remove_unused_closure_vars.cmx
-${PLIST.native}lib/ocaml/compiler-libs/remove_unused_closure_vars.mli
-${PLIST.native}lib/ocaml/compiler-libs/remove_unused_program_constructs.cmi
-${PLIST.native}lib/ocaml/compiler-libs/remove_unused_program_constructs.cmt
-${PLIST.native}lib/ocaml/compiler-libs/remove_unused_program_constructs.cmti
-${PLIST.native}lib/ocaml/compiler-libs/remove_unused_program_constructs.cmx
-${PLIST.native}lib/ocaml/compiler-libs/remove_unused_program_constructs.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
+${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
+${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
+${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
+${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
+${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
+${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
+${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
+${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/runtimedef.cmi
 lib/ocaml/compiler-libs/runtimedef.cmt
 lib/ocaml/compiler-libs/runtimedef.cmti
-${PLIST.native}lib/ocaml/compiler-libs/runtimedef.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/runtimedef.cmx
 lib/ocaml/compiler-libs/runtimedef.mli
-${PLIST.native}lib/ocaml/compiler-libs/schedgen.cmi
-${PLIST.native}lib/ocaml/compiler-libs/schedgen.cmt
-${PLIST.native}lib/ocaml/compiler-libs/schedgen.cmti
-${PLIST.native}lib/ocaml/compiler-libs/schedgen.cmx
-${PLIST.native}lib/ocaml/compiler-libs/schedgen.mli
-${PLIST.native}lib/ocaml/compiler-libs/scheduling.cmi
-${PLIST.native}lib/ocaml/compiler-libs/scheduling.cmt
-${PLIST.native}lib/ocaml/compiler-libs/scheduling.cmti
-${PLIST.native}lib/ocaml/compiler-libs/scheduling.cmx
-${PLIST.native}lib/ocaml/compiler-libs/scheduling.mli
-${PLIST.native}lib/ocaml/compiler-libs/selectgen.cmi
-${PLIST.native}lib/ocaml/compiler-libs/selectgen.cmt
-${PLIST.native}lib/ocaml/compiler-libs/selectgen.cmti
-${PLIST.native}lib/ocaml/compiler-libs/selectgen.cmx
-${PLIST.native}lib/ocaml/compiler-libs/selectgen.mli
-${PLIST.native}lib/ocaml/compiler-libs/selection.cmi
-${PLIST.native}lib/ocaml/compiler-libs/selection.cmt
-${PLIST.native}lib/ocaml/compiler-libs/selection.cmti
-${PLIST.native}lib/ocaml/compiler-libs/selection.cmx
-${PLIST.native}lib/ocaml/compiler-libs/selection.mli
-${PLIST.native}lib/ocaml/compiler-libs/semantics_of_primitives.cmi
-${PLIST.native}lib/ocaml/compiler-libs/semantics_of_primitives.cmt
-${PLIST.native}lib/ocaml/compiler-libs/semantics_of_primitives.cmti
-${PLIST.native}lib/ocaml/compiler-libs/semantics_of_primitives.cmx
-${PLIST.native}lib/ocaml/compiler-libs/semantics_of_primitives.mli
-${PLIST.native}lib/ocaml/compiler-libs/set_of_closures_id.cmi
-${PLIST.native}lib/ocaml/compiler-libs/set_of_closures_id.cmt
-${PLIST.native}lib/ocaml/compiler-libs/set_of_closures_id.cmti
-${PLIST.native}lib/ocaml/compiler-libs/set_of_closures_id.cmx
-${PLIST.native}lib/ocaml/compiler-libs/set_of_closures_id.mli
-${PLIST.native}lib/ocaml/compiler-libs/set_of_closures_origin.cmi
-${PLIST.native}lib/ocaml/compiler-libs/set_of_closures_origin.cmt
-${PLIST.native}lib/ocaml/compiler-libs/set_of_closures_origin.cmti
-${PLIST.native}lib/ocaml/compiler-libs/set_of_closures_origin.cmx
-${PLIST.native}lib/ocaml/compiler-libs/set_of_closures_origin.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
+${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
+${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
+${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
+${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
+${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
+${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
+${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/shape.cmi
 lib/ocaml/compiler-libs/shape.cmt
 lib/ocaml/compiler-libs/shape.cmti
-${PLIST.native}lib/ocaml/compiler-libs/shape.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/shape.cmx
 lib/ocaml/compiler-libs/shape.mli
-${PLIST.native}lib/ocaml/compiler-libs/share_constants.cmi
-${PLIST.native}lib/ocaml/compiler-libs/share_constants.cmt
-${PLIST.native}lib/ocaml/compiler-libs/share_constants.cmti
-${PLIST.native}lib/ocaml/compiler-libs/share_constants.cmx
-${PLIST.native}lib/ocaml/compiler-libs/share_constants.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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/share_constants.cmx
+${PLIST.ocaml-opt}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.native}lib/ocaml/compiler-libs/signature_group.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/signature_group.cmx
 lib/ocaml/compiler-libs/signature_group.mli
-${PLIST.native}lib/ocaml/compiler-libs/simple_value_approx.cmi
-${PLIST.native}lib/ocaml/compiler-libs/simple_value_approx.cmt
-${PLIST.native}lib/ocaml/compiler-libs/simple_value_approx.cmti
-${PLIST.native}lib/ocaml/compiler-libs/simple_value_approx.cmx
-${PLIST.native}lib/ocaml/compiler-libs/simple_value_approx.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
+${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/simplif.cmi
 lib/ocaml/compiler-libs/simplif.cmt
 lib/ocaml/compiler-libs/simplif.cmti
-${PLIST.native}lib/ocaml/compiler-libs/simplif.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/simplif.cmx
 lib/ocaml/compiler-libs/simplif.mli
-${PLIST.native}lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmi
-${PLIST.native}lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmt
-${PLIST.native}lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmti
-${PLIST.native}lib/ocaml/compiler-libs/simplify_boxed_integer_ops.cmx
-${PLIST.native}lib/ocaml/compiler-libs/simplify_boxed_integer_ops.mli
-${PLIST.native}lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.cmi
-${PLIST.native}lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.cmti
-${PLIST.native}lib/ocaml/compiler-libs/simplify_boxed_integer_ops_intf.mli
-${PLIST.native}lib/ocaml/compiler-libs/simplify_common.cmi
-${PLIST.native}lib/ocaml/compiler-libs/simplify_common.cmt
-${PLIST.native}lib/ocaml/compiler-libs/simplify_common.cmti
-${PLIST.native}lib/ocaml/compiler-libs/simplify_common.cmx
-${PLIST.native}lib/ocaml/compiler-libs/simplify_common.mli
-${PLIST.native}lib/ocaml/compiler-libs/simplify_primitives.cmi
-${PLIST.native}lib/ocaml/compiler-libs/simplify_primitives.cmt
-${PLIST.native}lib/ocaml/compiler-libs/simplify_primitives.cmti
-${PLIST.native}lib/ocaml/compiler-libs/simplify_primitives.cmx
-${PLIST.native}lib/ocaml/compiler-libs/simplify_primitives.mli
-${PLIST.native}lib/ocaml/compiler-libs/spill.cmi
-${PLIST.native}lib/ocaml/compiler-libs/spill.cmt
-${PLIST.native}lib/ocaml/compiler-libs/spill.cmti
-${PLIST.native}lib/ocaml/compiler-libs/spill.cmx
-${PLIST.native}lib/ocaml/compiler-libs/spill.mli
-${PLIST.native}lib/ocaml/compiler-libs/split.cmi
-${PLIST.native}lib/ocaml/compiler-libs/split.cmt
-${PLIST.native}lib/ocaml/compiler-libs/split.cmti
-${PLIST.native}lib/ocaml/compiler-libs/split.cmx
-${PLIST.native}lib/ocaml/compiler-libs/split.mli
-${PLIST.native}lib/ocaml/compiler-libs/static_exception.cmi
-${PLIST.native}lib/ocaml/compiler-libs/static_exception.cmt
-${PLIST.native}lib/ocaml/compiler-libs/static_exception.cmti
-${PLIST.native}lib/ocaml/compiler-libs/static_exception.cmx
-${PLIST.native}lib/ocaml/compiler-libs/static_exception.mli
-${PLIST.native}lib/ocaml/compiler-libs/strmatch.cmi
-${PLIST.native}lib/ocaml/compiler-libs/strmatch.cmt
-${PLIST.native}lib/ocaml/compiler-libs/strmatch.cmti
-${PLIST.native}lib/ocaml/compiler-libs/strmatch.cmx
-${PLIST.native}lib/ocaml/compiler-libs/strmatch.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
+${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
+${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
+${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
+${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
+${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
+${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/strmatch.cmx
+${PLIST.ocaml-opt}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
-${PLIST.native}lib/ocaml/compiler-libs/strongly_connected_components.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/strongly_connected_components.cmx
 lib/ocaml/compiler-libs/strongly_connected_components.mli
 lib/ocaml/compiler-libs/stypes.cmi
 lib/ocaml/compiler-libs/stypes.cmt
 lib/ocaml/compiler-libs/stypes.cmti
-${PLIST.native}lib/ocaml/compiler-libs/stypes.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/stypes.cmx
 lib/ocaml/compiler-libs/stypes.mli
 lib/ocaml/compiler-libs/subst.cmi
 lib/ocaml/compiler-libs/subst.cmt
 lib/ocaml/compiler-libs/subst.cmti
-${PLIST.native}lib/ocaml/compiler-libs/subst.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/subst.cmx
 lib/ocaml/compiler-libs/subst.mli
 lib/ocaml/compiler-libs/switch.cmi
 lib/ocaml/compiler-libs/switch.cmt
 lib/ocaml/compiler-libs/switch.cmti
-${PLIST.native}lib/ocaml/compiler-libs/switch.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/switch.cmx
 lib/ocaml/compiler-libs/switch.mli
-${PLIST.native}lib/ocaml/compiler-libs/symbol.cmi
-${PLIST.native}lib/ocaml/compiler-libs/symbol.cmt
-${PLIST.native}lib/ocaml/compiler-libs/symbol.cmti
-${PLIST.native}lib/ocaml/compiler-libs/symbol.cmx
-${PLIST.native}lib/ocaml/compiler-libs/symbol.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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/symbol.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/symbol.mli
 lib/ocaml/compiler-libs/symtable.cmi
 lib/ocaml/compiler-libs/symtable.cmt
 lib/ocaml/compiler-libs/symtable.cmti
-${PLIST.native}lib/ocaml/compiler-libs/symtable.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/symtable.cmx
 lib/ocaml/compiler-libs/symtable.mli
 lib/ocaml/compiler-libs/syntaxerr.cmi
 lib/ocaml/compiler-libs/syntaxerr.cmt
 lib/ocaml/compiler-libs/syntaxerr.cmti
-${PLIST.native}lib/ocaml/compiler-libs/syntaxerr.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/syntaxerr.cmx
 lib/ocaml/compiler-libs/syntaxerr.mli
-${PLIST.native}lib/ocaml/compiler-libs/tag.cmi
-${PLIST.native}lib/ocaml/compiler-libs/tag.cmt
-${PLIST.native}lib/ocaml/compiler-libs/tag.cmti
-${PLIST.native}lib/ocaml/compiler-libs/tag.cmx
-${PLIST.native}lib/ocaml/compiler-libs/tag.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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tag.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tag.mli
 lib/ocaml/compiler-libs/targetint.cmi
 lib/ocaml/compiler-libs/targetint.cmt
 lib/ocaml/compiler-libs/targetint.cmti
-${PLIST.native}lib/ocaml/compiler-libs/targetint.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/targetint.cmx
 lib/ocaml/compiler-libs/targetint.mli
 lib/ocaml/compiler-libs/tast_iterator.cmi
 lib/ocaml/compiler-libs/tast_iterator.cmt
 lib/ocaml/compiler-libs/tast_iterator.cmti
-${PLIST.native}lib/ocaml/compiler-libs/tast_iterator.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tast_iterator.cmx
 lib/ocaml/compiler-libs/tast_iterator.mli
 lib/ocaml/compiler-libs/tast_mapper.cmi
 lib/ocaml/compiler-libs/tast_mapper.cmt
 lib/ocaml/compiler-libs/tast_mapper.cmti
-${PLIST.native}lib/ocaml/compiler-libs/tast_mapper.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tast_mapper.cmx
 lib/ocaml/compiler-libs/tast_mapper.mli
 lib/ocaml/compiler-libs/terminfo.cmi
 lib/ocaml/compiler-libs/terminfo.cmt
 lib/ocaml/compiler-libs/terminfo.cmti
-${PLIST.native}lib/ocaml/compiler-libs/terminfo.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/terminfo.cmx
 lib/ocaml/compiler-libs/terminfo.mli
 lib/ocaml/compiler-libs/tmc.cmi
 lib/ocaml/compiler-libs/tmc.cmt
 lib/ocaml/compiler-libs/tmc.cmti
-${PLIST.native}lib/ocaml/compiler-libs/tmc.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/tmc.cmx
 lib/ocaml/compiler-libs/tmc.mli
 lib/ocaml/compiler-libs/topcommon.cmi
 lib/ocaml/compiler-libs/topcommon.cmt
 lib/ocaml/compiler-libs/topcommon.cmti
-${PLIST.native}lib/ocaml/compiler-libs/topcommon.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/topcommon.cmx
 lib/ocaml/compiler-libs/topcommon.mli
 lib/ocaml/compiler-libs/topdirs.cmi
 lib/ocaml/compiler-libs/topdirs.cmt
 lib/ocaml/compiler-libs/topdirs.cmti
-${PLIST.native}lib/ocaml/compiler-libs/topdirs.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/topdirs.cmx
 lib/ocaml/compiler-libs/topdirs.mli
 lib/ocaml/compiler-libs/topeval.cmi
 lib/ocaml/compiler-libs/topeval.cmt
 lib/ocaml/compiler-libs/topeval.cmti
-${PLIST.native}lib/ocaml/compiler-libs/topeval.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/topeval.cmx
 lib/ocaml/compiler-libs/topeval.mli
-${PLIST.native}lib/ocaml/compiler-libs/tophooks.cmi
-${PLIST.native}lib/ocaml/compiler-libs/tophooks.cmx
+${PLIST.ocaml-opt}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
 lib/ocaml/compiler-libs/toploop.cmti
-${PLIST.native}lib/ocaml/compiler-libs/toploop.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/toploop.cmx
 lib/ocaml/compiler-libs/toploop.mli
 lib/ocaml/compiler-libs/topmain.cmi
 lib/ocaml/compiler-libs/topmain.cmt
 lib/ocaml/compiler-libs/topmain.cmti
-${PLIST.native}lib/ocaml/compiler-libs/topmain.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/topmain.cmx
 lib/ocaml/compiler-libs/topmain.mli
 lib/ocaml/compiler-libs/topstart.cmi
 lib/ocaml/compiler-libs/topstart.cmo
 lib/ocaml/compiler-libs/topstart.cmt
-${PLIST.native}lib/ocaml/compiler-libs/topstart.cmx
-${PLIST.native}lib/ocaml/compiler-libs/topstart.o
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/topstart.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/topstart.o
 lib/ocaml/compiler-libs/trace.cmi
 lib/ocaml/compiler-libs/trace.cmt
 lib/ocaml/compiler-libs/trace.cmti
-${PLIST.native}lib/ocaml/compiler-libs/trace.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/trace.cmx
 lib/ocaml/compiler-libs/trace.mli
 lib/ocaml/compiler-libs/translattribute.cmi
 lib/ocaml/compiler-libs/translattribute.cmt
 lib/ocaml/compiler-libs/translattribute.cmti
-${PLIST.native}lib/ocaml/compiler-libs/translattribute.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/translattribute.cmx
 lib/ocaml/compiler-libs/translattribute.mli
 lib/ocaml/compiler-libs/translclass.cmi
 lib/ocaml/compiler-libs/translclass.cmt
 lib/ocaml/compiler-libs/translclass.cmti
-${PLIST.native}lib/ocaml/compiler-libs/translclass.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/translclass.cmx
 lib/ocaml/compiler-libs/translclass.mli
 lib/ocaml/compiler-libs/translcore.cmi
 lib/ocaml/compiler-libs/translcore.cmt
 lib/ocaml/compiler-libs/translcore.cmti
-${PLIST.native}lib/ocaml/compiler-libs/translcore.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/translcore.cmx
 lib/ocaml/compiler-libs/translcore.mli
 lib/ocaml/compiler-libs/translmod.cmi
 lib/ocaml/compiler-libs/translmod.cmt
 lib/ocaml/compiler-libs/translmod.cmti
-${PLIST.native}lib/ocaml/compiler-libs/translmod.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/translmod.cmx
 lib/ocaml/compiler-libs/translmod.mli
 lib/ocaml/compiler-libs/translobj.cmi
 lib/ocaml/compiler-libs/translobj.cmt
 lib/ocaml/compiler-libs/translobj.cmti
-${PLIST.native}lib/ocaml/compiler-libs/translobj.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/translobj.cmx
 lib/ocaml/compiler-libs/translobj.mli
 lib/ocaml/compiler-libs/translprim.cmi
 lib/ocaml/compiler-libs/translprim.cmt
 lib/ocaml/compiler-libs/translprim.cmti
-${PLIST.native}lib/ocaml/compiler-libs/translprim.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/translprim.cmx
 lib/ocaml/compiler-libs/translprim.mli
-${PLIST.native}lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmi
-${PLIST.native}lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmt
-${PLIST.native}lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmti
-${PLIST.native}lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmx
-${PLIST.native}lib/ocaml/compiler-libs/traverse_for_exported_symbols.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
+${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/type_immediacy.cmi
 lib/ocaml/compiler-libs/type_immediacy.cmt
 lib/ocaml/compiler-libs/type_immediacy.cmti
-${PLIST.native}lib/ocaml/compiler-libs/type_immediacy.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/type_immediacy.cmx
 lib/ocaml/compiler-libs/type_immediacy.mli
 lib/ocaml/compiler-libs/typeclass.cmi
 lib/ocaml/compiler-libs/typeclass.cmt
 lib/ocaml/compiler-libs/typeclass.cmti
-${PLIST.native}lib/ocaml/compiler-libs/typeclass.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typeclass.cmx
 lib/ocaml/compiler-libs/typeclass.mli
 lib/ocaml/compiler-libs/typecore.cmi
 lib/ocaml/compiler-libs/typecore.cmt
 lib/ocaml/compiler-libs/typecore.cmti
-${PLIST.native}lib/ocaml/compiler-libs/typecore.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typecore.cmx
 lib/ocaml/compiler-libs/typecore.mli
 lib/ocaml/compiler-libs/typedecl.cmi
 lib/ocaml/compiler-libs/typedecl.cmt
 lib/ocaml/compiler-libs/typedecl.cmti
-${PLIST.native}lib/ocaml/compiler-libs/typedecl.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedecl.cmx
 lib/ocaml/compiler-libs/typedecl.mli
 lib/ocaml/compiler-libs/typedecl_immediacy.cmi
 lib/ocaml/compiler-libs/typedecl_immediacy.cmt
 lib/ocaml/compiler-libs/typedecl_immediacy.cmti
-${PLIST.native}lib/ocaml/compiler-libs/typedecl_immediacy.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedecl_immediacy.cmx
 lib/ocaml/compiler-libs/typedecl_immediacy.mli
 lib/ocaml/compiler-libs/typedecl_properties.cmi
 lib/ocaml/compiler-libs/typedecl_properties.cmt
 lib/ocaml/compiler-libs/typedecl_properties.cmti
-${PLIST.native}lib/ocaml/compiler-libs/typedecl_properties.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedecl_properties.cmx
 lib/ocaml/compiler-libs/typedecl_properties.mli
 lib/ocaml/compiler-libs/typedecl_separability.cmi
 lib/ocaml/compiler-libs/typedecl_separability.cmt
 lib/ocaml/compiler-libs/typedecl_separability.cmti
-${PLIST.native}lib/ocaml/compiler-libs/typedecl_separability.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedecl_separability.cmx
 lib/ocaml/compiler-libs/typedecl_separability.mli
 lib/ocaml/compiler-libs/typedecl_unboxed.cmi
 lib/ocaml/compiler-libs/typedecl_unboxed.cmt
 lib/ocaml/compiler-libs/typedecl_unboxed.cmti
-${PLIST.native}lib/ocaml/compiler-libs/typedecl_unboxed.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedecl_unboxed.cmx
 lib/ocaml/compiler-libs/typedecl_unboxed.mli
 lib/ocaml/compiler-libs/typedecl_variance.cmi
 lib/ocaml/compiler-libs/typedecl_variance.cmt
 lib/ocaml/compiler-libs/typedecl_variance.cmti
-${PLIST.native}lib/ocaml/compiler-libs/typedecl_variance.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedecl_variance.cmx
 lib/ocaml/compiler-libs/typedecl_variance.mli
 lib/ocaml/compiler-libs/typedtree.cmi
 lib/ocaml/compiler-libs/typedtree.cmt
 lib/ocaml/compiler-libs/typedtree.cmti
-${PLIST.native}lib/ocaml/compiler-libs/typedtree.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typedtree.cmx
 lib/ocaml/compiler-libs/typedtree.mli
 lib/ocaml/compiler-libs/typemod.cmi
 lib/ocaml/compiler-libs/typemod.cmt
 lib/ocaml/compiler-libs/typemod.cmti
-${PLIST.native}lib/ocaml/compiler-libs/typemod.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typemod.cmx
 lib/ocaml/compiler-libs/typemod.mli
 lib/ocaml/compiler-libs/typeopt.cmi
 lib/ocaml/compiler-libs/typeopt.cmt
 lib/ocaml/compiler-libs/typeopt.cmti
-${PLIST.native}lib/ocaml/compiler-libs/typeopt.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typeopt.cmx
 lib/ocaml/compiler-libs/typeopt.mli
 lib/ocaml/compiler-libs/types.cmi
 lib/ocaml/compiler-libs/types.cmt
 lib/ocaml/compiler-libs/types.cmti
-${PLIST.native}lib/ocaml/compiler-libs/types.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/types.cmx
 lib/ocaml/compiler-libs/types.mli
 lib/ocaml/compiler-libs/typetexp.cmi
 lib/ocaml/compiler-libs/typetexp.cmt
 lib/ocaml/compiler-libs/typetexp.cmti
-${PLIST.native}lib/ocaml/compiler-libs/typetexp.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/typetexp.cmx
 lib/ocaml/compiler-libs/typetexp.mli
-${PLIST.native}lib/ocaml/compiler-libs/un_anf.cmi
-${PLIST.native}lib/ocaml/compiler-libs/un_anf.cmt
-${PLIST.native}lib/ocaml/compiler-libs/un_anf.cmti
-${PLIST.native}lib/ocaml/compiler-libs/un_anf.cmx
-${PLIST.native}lib/ocaml/compiler-libs/un_anf.mli
-${PLIST.native}lib/ocaml/compiler-libs/unbox_closures.cmi
-${PLIST.native}lib/ocaml/compiler-libs/unbox_closures.cmt
-${PLIST.native}lib/ocaml/compiler-libs/unbox_closures.cmti
-${PLIST.native}lib/ocaml/compiler-libs/unbox_closures.cmx
-${PLIST.native}lib/ocaml/compiler-libs/unbox_closures.mli
-${PLIST.native}lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmi
-${PLIST.native}lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmt
-${PLIST.native}lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmti
-${PLIST.native}lib/ocaml/compiler-libs/unbox_free_vars_of_closures.cmx
-${PLIST.native}lib/ocaml/compiler-libs/unbox_free_vars_of_closures.mli
-${PLIST.native}lib/ocaml/compiler-libs/unbox_specialised_args.cmi
-${PLIST.native}lib/ocaml/compiler-libs/unbox_specialised_args.cmt
-${PLIST.native}lib/ocaml/compiler-libs/unbox_specialised_args.cmti
-${PLIST.native}lib/ocaml/compiler-libs/unbox_specialised_args.cmx
-${PLIST.native}lib/ocaml/compiler-libs/unbox_specialised_args.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
+${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
+${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
+${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
+${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/untypeast.cmi
 lib/ocaml/compiler-libs/untypeast.cmt
 lib/ocaml/compiler-libs/untypeast.cmti
-${PLIST.native}lib/ocaml/compiler-libs/untypeast.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/untypeast.cmx
 lib/ocaml/compiler-libs/untypeast.mli
-${PLIST.native}lib/ocaml/compiler-libs/var_within_closure.cmi
-${PLIST.native}lib/ocaml/compiler-libs/var_within_closure.cmt
-${PLIST.native}lib/ocaml/compiler-libs/var_within_closure.cmti
-${PLIST.native}lib/ocaml/compiler-libs/var_within_closure.cmx
-${PLIST.native}lib/ocaml/compiler-libs/var_within_closure.mli
-${PLIST.native}lib/ocaml/compiler-libs/variable.cmi
-${PLIST.native}lib/ocaml/compiler-libs/variable.cmt
-${PLIST.native}lib/ocaml/compiler-libs/variable.cmti
-${PLIST.native}lib/ocaml/compiler-libs/variable.cmx
-${PLIST.native}lib/ocaml/compiler-libs/variable.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
+${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/variable.cmx
+${PLIST.ocaml-opt}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.native}lib/ocaml/compiler-libs/warnings.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/warnings.cmx
 lib/ocaml/compiler-libs/warnings.mli
-${PLIST.native}lib/ocaml/compiler-libs/x86_ast.cmi
-${PLIST.native}lib/ocaml/compiler-libs/x86_ast.cmti
-${PLIST.native}lib/ocaml/compiler-libs/x86_ast.mli
-${PLIST.native}lib/ocaml/compiler-libs/x86_dsl.cmi
-${PLIST.native}lib/ocaml/compiler-libs/x86_dsl.cmt
-${PLIST.native}lib/ocaml/compiler-libs/x86_dsl.cmti
-${PLIST.native}lib/ocaml/compiler-libs/x86_dsl.cmx
-${PLIST.native}lib/ocaml/compiler-libs/x86_dsl.mli
-${PLIST.native}lib/ocaml/compiler-libs/x86_gas.cmi
-${PLIST.native}lib/ocaml/compiler-libs/x86_gas.cmt
-${PLIST.native}lib/ocaml/compiler-libs/x86_gas.cmti
-${PLIST.native}lib/ocaml/compiler-libs/x86_gas.cmx
-${PLIST.native}lib/ocaml/compiler-libs/x86_gas.mli
-${PLIST.native}lib/ocaml/compiler-libs/x86_masm.cmi
-${PLIST.native}lib/ocaml/compiler-libs/x86_masm.cmt
-${PLIST.native}lib/ocaml/compiler-libs/x86_masm.cmti
-${PLIST.native}lib/ocaml/compiler-libs/x86_masm.cmx
-${PLIST.native}lib/ocaml/compiler-libs/x86_masm.mli
-${PLIST.native}lib/ocaml/compiler-libs/x86_proc.cmi
-${PLIST.native}lib/ocaml/compiler-libs/x86_proc.cmt
-${PLIST.native}lib/ocaml/compiler-libs/x86_proc.cmti
-${PLIST.native}lib/ocaml/compiler-libs/x86_proc.cmx
-${PLIST.native}lib/ocaml/compiler-libs/x86_proc.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
+${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
+${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
+${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_proc.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/x86_proc.mli
 lib/ocaml/complex.ml
 lib/ocaml/complex.mli
 lib/ocaml/digest.ml
 lib/ocaml/digest.mli
-${PLIST.native}lib/ocaml/dynlink.a
+${PLIST.ocaml-opt}lib/ocaml/dynlink.a
 lib/ocaml/dynlink.cma
 lib/ocaml/dynlink.cmi
 lib/ocaml/dynlink.cmti
-${PLIST.native}lib/ocaml/dynlink.cmx
-${PLIST.native}lib/ocaml/dynlink.cmxa
+${PLIST.ocaml-opt}lib/ocaml/dynlink.cmx
+${PLIST.ocaml-opt}lib/ocaml/dynlink.cmxa
 lib/ocaml/dynlink.mli
-${PLIST.native}lib/ocaml/dynlink_common.cmx
-${PLIST.native}lib/ocaml/dynlink_compilerlibs.cmx
-${PLIST.native}lib/ocaml/dynlink_platform_intf.cmx
-${PLIST.native}lib/ocaml/dynlink_types.cmx
+${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/either.ml
 lib/ocaml/either.mli
 lib/ocaml/ephemeron.ml
@@ -1562,11 +1562,11 @@ lib/ocaml/lazy.mli
 lib/ocaml/ld.conf
 lib/ocaml/lexing.ml
 lib/ocaml/lexing.mli
-${PLIST.native}lib/ocaml/libasmrun.a
-${PLIST.native}lib/ocaml/libasmrun_pic.a
-${PLIST.native}lib/ocaml/libasmrun_shared.so
-${PLIST.native}lib/ocaml/libasmrund.a
-${PLIST.native}lib/ocaml/libasmruni.a
+${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/libcamlrun.a
 lib/ocaml/libcamlrun_pic.a
 lib/ocaml/libcamlrun_shared.so
@@ -1574,7 +1574,7 @@ lib/ocaml/libcamlrund.a
 lib/ocaml/libcamlruni.a
 lib/ocaml/libcamlstr.a
 lib/ocaml/libthreads.a
-${PLIST.native}lib/ocaml/libthreadsnat.a
+${PLIST.ocaml-opt}lib/ocaml/libthreadsnat.a
 lib/ocaml/libunix.a
 lib/ocaml/list.ml
 lib/ocaml/list.mli
@@ -1592,106 +1592,106 @@ lib/ocaml/obj.ml
 lib/ocaml/obj.mli
 lib/ocaml/ocamldoc/ocamldoc.hva
 lib/ocaml/ocamldoc/odoc.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc.cmx
 lib/ocaml/ocamldoc/odoc_analyse.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_analyse.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_analyse.cmx
 lib/ocaml/ocamldoc/odoc_args.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_args.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_args.cmx
 lib/ocaml/ocamldoc/odoc_ast.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_ast.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_ast.cmx
 lib/ocaml/ocamldoc/odoc_class.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_class.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_class.cmx
 lib/ocaml/ocamldoc/odoc_comments.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_comments.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_comments.cmx
 lib/ocaml/ocamldoc/odoc_comments_global.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_comments_global.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_comments_global.cmx
 lib/ocaml/ocamldoc/odoc_config.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_config.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_config.cmx
 lib/ocaml/ocamldoc/odoc_control.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_control.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_control.cmx
 lib/ocaml/ocamldoc/odoc_cross.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_cross.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_cross.cmx
 lib/ocaml/ocamldoc/odoc_dag2html.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_dag2html.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_dag2html.cmx
 lib/ocaml/ocamldoc/odoc_dep.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_dep.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_dep.cmx
 lib/ocaml/ocamldoc/odoc_dot.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_dot.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_dot.cmx
 lib/ocaml/ocamldoc/odoc_env.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_env.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_env.cmx
 lib/ocaml/ocamldoc/odoc_exception.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_exception.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_exception.cmx
 lib/ocaml/ocamldoc/odoc_extension.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_extension.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_extension.cmx
 lib/ocaml/ocamldoc/odoc_gen.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_gen.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_gen.cmx
 lib/ocaml/ocamldoc/odoc_global.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_global.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_global.cmx
 lib/ocaml/ocamldoc/odoc_html.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_html.cmx
-${PLIST.native}lib/ocaml/ocamldoc/odoc_info.a
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_html.cmx
+${PLIST.ocaml-opt}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.native}lib/ocaml/ocamldoc/odoc_info.cmx
-${PLIST.native}lib/ocaml/ocamldoc/odoc_info.cmxa
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_info.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_info.cmxa
 lib/ocaml/ocamldoc/odoc_info.mli
 lib/ocaml/ocamldoc/odoc_inherit.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_inherit.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_inherit.cmx
 lib/ocaml/ocamldoc/odoc_latex.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_latex.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_latex.cmx
 lib/ocaml/ocamldoc/odoc_latex_style.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_latex_style.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_latex_style.cmx
 lib/ocaml/ocamldoc/odoc_lexer.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_lexer.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_lexer.cmx
 lib/ocaml/ocamldoc/odoc_man.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_man.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_man.cmx
 lib/ocaml/ocamldoc/odoc_merge.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_merge.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_merge.cmx
 lib/ocaml/ocamldoc/odoc_messages.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_messages.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_messages.cmx
 lib/ocaml/ocamldoc/odoc_misc.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_misc.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_misc.cmx
 lib/ocaml/ocamldoc/odoc_module.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_module.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_module.cmx
 lib/ocaml/ocamldoc/odoc_name.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_name.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_name.cmx
 lib/ocaml/ocamldoc/odoc_ocamlhtml.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_ocamlhtml.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_ocamlhtml.cmx
 lib/ocaml/ocamldoc/odoc_parameter.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_parameter.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_parameter.cmx
 lib/ocaml/ocamldoc/odoc_parser.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_parser.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_parser.cmx
 lib/ocaml/ocamldoc/odoc_print.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_print.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_print.cmx
 lib/ocaml/ocamldoc/odoc_scan.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_scan.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_scan.cmx
 lib/ocaml/ocamldoc/odoc_search.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_search.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_search.cmx
 lib/ocaml/ocamldoc/odoc_see_lexer.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_see_lexer.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_see_lexer.cmx
 lib/ocaml/ocamldoc/odoc_sig.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_sig.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_sig.cmx
 lib/ocaml/ocamldoc/odoc_str.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_str.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_str.cmx
 lib/ocaml/ocamldoc/odoc_test.cmi
 lib/ocaml/ocamldoc/odoc_texi.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_texi.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_texi.cmx
 lib/ocaml/ocamldoc/odoc_text.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_text.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_text.cmx
 lib/ocaml/ocamldoc/odoc_text_lexer.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_text_lexer.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_text_lexer.cmx
 lib/ocaml/ocamldoc/odoc_text_parser.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_text_parser.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_text_parser.cmx
 lib/ocaml/ocamldoc/odoc_to_text.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_to_text.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_to_text.cmx
 lib/ocaml/ocamldoc/odoc_type.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_type.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_type.cmx
 lib/ocaml/ocamldoc/odoc_types.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_types.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_types.cmx
 lib/ocaml/ocamldoc/odoc_value.cmi
-${PLIST.native}lib/ocaml/ocamldoc/odoc_value.cmx
+${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc_value.cmx
 lib/ocaml/oo.ml
 lib/ocaml/oo.mli
 lib/ocaml/option.ml
@@ -1709,8 +1709,8 @@ lib/ocaml/profiling.cmi
 lib/ocaml/profiling.cmo
 lib/ocaml/profiling.cmt
 lib/ocaml/profiling.cmti
-${PLIST.native}lib/ocaml/profiling.cmx
-${PLIST.native}lib/ocaml/profiling.o
+${PLIST.ocaml-opt}lib/ocaml/profiling.cmx
+${PLIST.ocaml-opt}lib/ocaml/profiling.o
 lib/ocaml/queue.ml
 lib/ocaml/queue.mli
 lib/ocaml/random.ml
@@ -1730,252 +1730,252 @@ lib/ocaml/stdLabels.mli
 lib/ocaml/std_exit.cmi
 lib/ocaml/std_exit.cmo
 lib/ocaml/std_exit.cmt
-${PLIST.native}lib/ocaml/std_exit.cmx
+${PLIST.ocaml-opt}lib/ocaml/std_exit.cmx
 lib/ocaml/std_exit.ml
-${PLIST.native}lib/ocaml/std_exit.o
-${PLIST.native}lib/ocaml/stdlib.a
+${PLIST.ocaml-opt}lib/ocaml/std_exit.o
+${PLIST.ocaml-opt}lib/ocaml/stdlib.a
 lib/ocaml/stdlib.cma
 lib/ocaml/stdlib.cmi
 lib/ocaml/stdlib.cmt
 lib/ocaml/stdlib.cmti
-${PLIST.native}lib/ocaml/stdlib.cmx
-${PLIST.native}lib/ocaml/stdlib.cmxa
+${PLIST.ocaml-opt}lib/ocaml/stdlib.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib.cmxa
 lib/ocaml/stdlib.ml
 lib/ocaml/stdlib.mli
 lib/ocaml/stdlib__Arg.cmi
 lib/ocaml/stdlib__Arg.cmt
 lib/ocaml/stdlib__Arg.cmti
-${PLIST.native}lib/ocaml/stdlib__Arg.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Arg.cmx
 lib/ocaml/stdlib__Array.cmi
 lib/ocaml/stdlib__Array.cmt
 lib/ocaml/stdlib__Array.cmti
-${PLIST.native}lib/ocaml/stdlib__Array.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Array.cmx
 lib/ocaml/stdlib__ArrayLabels.cmi
 lib/ocaml/stdlib__ArrayLabels.cmt
 lib/ocaml/stdlib__ArrayLabels.cmti
-${PLIST.native}lib/ocaml/stdlib__ArrayLabels.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__ArrayLabels.cmx
 lib/ocaml/stdlib__Atomic.cmi
 lib/ocaml/stdlib__Atomic.cmt
 lib/ocaml/stdlib__Atomic.cmti
-${PLIST.native}lib/ocaml/stdlib__Atomic.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Atomic.cmx
 lib/ocaml/stdlib__Bigarray.cmi
 lib/ocaml/stdlib__Bigarray.cmt
 lib/ocaml/stdlib__Bigarray.cmti
-${PLIST.native}lib/ocaml/stdlib__Bigarray.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Bigarray.cmx
 lib/ocaml/stdlib__Bool.cmi
 lib/ocaml/stdlib__Bool.cmt
 lib/ocaml/stdlib__Bool.cmti
-${PLIST.native}lib/ocaml/stdlib__Bool.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Bool.cmx
 lib/ocaml/stdlib__Buffer.cmi
 lib/ocaml/stdlib__Buffer.cmt
 lib/ocaml/stdlib__Buffer.cmti
-${PLIST.native}lib/ocaml/stdlib__Buffer.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Buffer.cmx
 lib/ocaml/stdlib__Bytes.cmi
 lib/ocaml/stdlib__Bytes.cmt
 lib/ocaml/stdlib__Bytes.cmti
-${PLIST.native}lib/ocaml/stdlib__Bytes.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Bytes.cmx
 lib/ocaml/stdlib__BytesLabels.cmi
 lib/ocaml/stdlib__BytesLabels.cmt
 lib/ocaml/stdlib__BytesLabels.cmti
-${PLIST.native}lib/ocaml/stdlib__BytesLabels.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__BytesLabels.cmx
 lib/ocaml/stdlib__Callback.cmi
 lib/ocaml/stdlib__Callback.cmt
 lib/ocaml/stdlib__Callback.cmti
-${PLIST.native}lib/ocaml/stdlib__Callback.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Callback.cmx
 lib/ocaml/stdlib__Char.cmi
 lib/ocaml/stdlib__Char.cmt
 lib/ocaml/stdlib__Char.cmti
-${PLIST.native}lib/ocaml/stdlib__Char.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Char.cmx
 lib/ocaml/stdlib__Complex.cmi
 lib/ocaml/stdlib__Complex.cmt
 lib/ocaml/stdlib__Complex.cmti
-${PLIST.native}lib/ocaml/stdlib__Complex.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Complex.cmx
 lib/ocaml/stdlib__Digest.cmi
 lib/ocaml/stdlib__Digest.cmt
 lib/ocaml/stdlib__Digest.cmti
-${PLIST.native}lib/ocaml/stdlib__Digest.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Digest.cmx
 lib/ocaml/stdlib__Either.cmi
 lib/ocaml/stdlib__Either.cmt
 lib/ocaml/stdlib__Either.cmti
-${PLIST.native}lib/ocaml/stdlib__Either.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Either.cmx
 lib/ocaml/stdlib__Ephemeron.cmi
 lib/ocaml/stdlib__Ephemeron.cmt
 lib/ocaml/stdlib__Ephemeron.cmti
-${PLIST.native}lib/ocaml/stdlib__Ephemeron.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Ephemeron.cmx
 lib/ocaml/stdlib__Filename.cmi
 lib/ocaml/stdlib__Filename.cmt
 lib/ocaml/stdlib__Filename.cmti
-${PLIST.native}lib/ocaml/stdlib__Filename.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Filename.cmx
 lib/ocaml/stdlib__Float.cmi
 lib/ocaml/stdlib__Float.cmt
 lib/ocaml/stdlib__Float.cmti
-${PLIST.native}lib/ocaml/stdlib__Float.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Float.cmx
 lib/ocaml/stdlib__Format.cmi
 lib/ocaml/stdlib__Format.cmt
 lib/ocaml/stdlib__Format.cmti
-${PLIST.native}lib/ocaml/stdlib__Format.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Format.cmx
 lib/ocaml/stdlib__Fun.cmi
 lib/ocaml/stdlib__Fun.cmt
 lib/ocaml/stdlib__Fun.cmti
-${PLIST.native}lib/ocaml/stdlib__Fun.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Fun.cmx
 lib/ocaml/stdlib__Gc.cmi
 lib/ocaml/stdlib__Gc.cmt
 lib/ocaml/stdlib__Gc.cmti
-${PLIST.native}lib/ocaml/stdlib__Gc.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Gc.cmx
 lib/ocaml/stdlib__Genlex.cmi
 lib/ocaml/stdlib__Genlex.cmt
 lib/ocaml/stdlib__Genlex.cmti
-${PLIST.native}lib/ocaml/stdlib__Genlex.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Genlex.cmx
 lib/ocaml/stdlib__Hashtbl.cmi
 lib/ocaml/stdlib__Hashtbl.cmt
 lib/ocaml/stdlib__Hashtbl.cmti
-${PLIST.native}lib/ocaml/stdlib__Hashtbl.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Hashtbl.cmx
 lib/ocaml/stdlib__In_channel.cmi
 lib/ocaml/stdlib__In_channel.cmt
 lib/ocaml/stdlib__In_channel.cmti
-${PLIST.native}lib/ocaml/stdlib__In_channel.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__In_channel.cmx
 lib/ocaml/stdlib__Int.cmi
 lib/ocaml/stdlib__Int.cmt
 lib/ocaml/stdlib__Int.cmti
-${PLIST.native}lib/ocaml/stdlib__Int.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Int.cmx
 lib/ocaml/stdlib__Int32.cmi
 lib/ocaml/stdlib__Int32.cmt
 lib/ocaml/stdlib__Int32.cmti
-${PLIST.native}lib/ocaml/stdlib__Int32.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Int32.cmx
 lib/ocaml/stdlib__Int64.cmi
 lib/ocaml/stdlib__Int64.cmt
 lib/ocaml/stdlib__Int64.cmti
-${PLIST.native}lib/ocaml/stdlib__Int64.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Int64.cmx
 lib/ocaml/stdlib__Lazy.cmi
 lib/ocaml/stdlib__Lazy.cmt
 lib/ocaml/stdlib__Lazy.cmti
-${PLIST.native}lib/ocaml/stdlib__Lazy.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Lazy.cmx
 lib/ocaml/stdlib__Lexing.cmi
 lib/ocaml/stdlib__Lexing.cmt
 lib/ocaml/stdlib__Lexing.cmti
-${PLIST.native}lib/ocaml/stdlib__Lexing.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Lexing.cmx
 lib/ocaml/stdlib__List.cmi
 lib/ocaml/stdlib__List.cmt
 lib/ocaml/stdlib__List.cmti
-${PLIST.native}lib/ocaml/stdlib__List.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__List.cmx
 lib/ocaml/stdlib__ListLabels.cmi
 lib/ocaml/stdlib__ListLabels.cmt
 lib/ocaml/stdlib__ListLabels.cmti
-${PLIST.native}lib/ocaml/stdlib__ListLabels.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__ListLabels.cmx
 lib/ocaml/stdlib__Map.cmi
 lib/ocaml/stdlib__Map.cmt
 lib/ocaml/stdlib__Map.cmti
-${PLIST.native}lib/ocaml/stdlib__Map.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Map.cmx
 lib/ocaml/stdlib__Marshal.cmi
 lib/ocaml/stdlib__Marshal.cmt
 lib/ocaml/stdlib__Marshal.cmti
-${PLIST.native}lib/ocaml/stdlib__Marshal.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Marshal.cmx
 lib/ocaml/stdlib__MoreLabels.cmi
 lib/ocaml/stdlib__MoreLabels.cmt
 lib/ocaml/stdlib__MoreLabels.cmti
-${PLIST.native}lib/ocaml/stdlib__MoreLabels.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__MoreLabels.cmx
 lib/ocaml/stdlib__Nativeint.cmi
 lib/ocaml/stdlib__Nativeint.cmt
 lib/ocaml/stdlib__Nativeint.cmti
-${PLIST.native}lib/ocaml/stdlib__Nativeint.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Nativeint.cmx
 lib/ocaml/stdlib__Obj.cmi
 lib/ocaml/stdlib__Obj.cmt
 lib/ocaml/stdlib__Obj.cmti
-${PLIST.native}lib/ocaml/stdlib__Obj.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Obj.cmx
 lib/ocaml/stdlib__Oo.cmi
 lib/ocaml/stdlib__Oo.cmt
 lib/ocaml/stdlib__Oo.cmti
-${PLIST.native}lib/ocaml/stdlib__Oo.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Oo.cmx
 lib/ocaml/stdlib__Option.cmi
 lib/ocaml/stdlib__Option.cmt
 lib/ocaml/stdlib__Option.cmti
-${PLIST.native}lib/ocaml/stdlib__Option.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Option.cmx
 lib/ocaml/stdlib__Out_channel.cmi
 lib/ocaml/stdlib__Out_channel.cmt
 lib/ocaml/stdlib__Out_channel.cmti
-${PLIST.native}lib/ocaml/stdlib__Out_channel.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Out_channel.cmx
 lib/ocaml/stdlib__Parsing.cmi
 lib/ocaml/stdlib__Parsing.cmt
 lib/ocaml/stdlib__Parsing.cmti
-${PLIST.native}lib/ocaml/stdlib__Parsing.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Parsing.cmx
 lib/ocaml/stdlib__Pervasives.cmi
 lib/ocaml/stdlib__Pervasives.cmt
-${PLIST.native}lib/ocaml/stdlib__Pervasives.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Pervasives.cmx
 lib/ocaml/stdlib__Printexc.cmi
 lib/ocaml/stdlib__Printexc.cmt
 lib/ocaml/stdlib__Printexc.cmti
-${PLIST.native}lib/ocaml/stdlib__Printexc.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Printexc.cmx
 lib/ocaml/stdlib__Printf.cmi
 lib/ocaml/stdlib__Printf.cmt
 lib/ocaml/stdlib__Printf.cmti
-${PLIST.native}lib/ocaml/stdlib__Printf.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Printf.cmx
 lib/ocaml/stdlib__Queue.cmi
 lib/ocaml/stdlib__Queue.cmt
 lib/ocaml/stdlib__Queue.cmti
-${PLIST.native}lib/ocaml/stdlib__Queue.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Queue.cmx
 lib/ocaml/stdlib__Random.cmi
 lib/ocaml/stdlib__Random.cmt
 lib/ocaml/stdlib__Random.cmti
-${PLIST.native}lib/ocaml/stdlib__Random.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Random.cmx
 lib/ocaml/stdlib__Result.cmi
 lib/ocaml/stdlib__Result.cmt
 lib/ocaml/stdlib__Result.cmti
-${PLIST.native}lib/ocaml/stdlib__Result.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Result.cmx
 lib/ocaml/stdlib__Scanf.cmi
 lib/ocaml/stdlib__Scanf.cmt
 lib/ocaml/stdlib__Scanf.cmti
-${PLIST.native}lib/ocaml/stdlib__Scanf.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Scanf.cmx
 lib/ocaml/stdlib__Seq.cmi
 lib/ocaml/stdlib__Seq.cmt
 lib/ocaml/stdlib__Seq.cmti
-${PLIST.native}lib/ocaml/stdlib__Seq.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Seq.cmx
 lib/ocaml/stdlib__Set.cmi
 lib/ocaml/stdlib__Set.cmt
 lib/ocaml/stdlib__Set.cmti
-${PLIST.native}lib/ocaml/stdlib__Set.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Set.cmx
 lib/ocaml/stdlib__Stack.cmi
 lib/ocaml/stdlib__Stack.cmt
 lib/ocaml/stdlib__Stack.cmti
-${PLIST.native}lib/ocaml/stdlib__Stack.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Stack.cmx
 lib/ocaml/stdlib__StdLabels.cmi
 lib/ocaml/stdlib__StdLabels.cmt
 lib/ocaml/stdlib__StdLabels.cmti
-${PLIST.native}lib/ocaml/stdlib__StdLabels.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__StdLabels.cmx
 lib/ocaml/stdlib__Stream.cmi
 lib/ocaml/stdlib__Stream.cmt
 lib/ocaml/stdlib__Stream.cmti
-${PLIST.native}lib/ocaml/stdlib__Stream.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Stream.cmx
 lib/ocaml/stdlib__String.cmi
 lib/ocaml/stdlib__String.cmt
 lib/ocaml/stdlib__String.cmti
-${PLIST.native}lib/ocaml/stdlib__String.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__String.cmx
 lib/ocaml/stdlib__StringLabels.cmi
 lib/ocaml/stdlib__StringLabels.cmt
 lib/ocaml/stdlib__StringLabels.cmti
-${PLIST.native}lib/ocaml/stdlib__StringLabels.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__StringLabels.cmx
 lib/ocaml/stdlib__Sys.cmi
 lib/ocaml/stdlib__Sys.cmt
 lib/ocaml/stdlib__Sys.cmti
-${PLIST.native}lib/ocaml/stdlib__Sys.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Sys.cmx
 lib/ocaml/stdlib__Uchar.cmi
 lib/ocaml/stdlib__Uchar.cmt
 lib/ocaml/stdlib__Uchar.cmti
-${PLIST.native}lib/ocaml/stdlib__Uchar.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Uchar.cmx
 lib/ocaml/stdlib__Unit.cmi
 lib/ocaml/stdlib__Unit.cmt
 lib/ocaml/stdlib__Unit.cmti
-${PLIST.native}lib/ocaml/stdlib__Unit.cmx
+${PLIST.ocaml-opt}lib/ocaml/stdlib__Unit.cmx
 lib/ocaml/stdlib__Weak.cmi
 lib/ocaml/stdlib__Weak.cmt
 lib/ocaml/stdlib__Weak.cmti
-${PLIST.native}lib/ocaml/stdlib__Weak.cmx
-${PLIST.native}lib/ocaml/str.a
+${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.native}lib/ocaml/str.cmx
-${PLIST.native}lib/ocaml/str.cmxa
-${PLIST.native}lib/ocaml/str.cmxs
+${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
@@ -1990,31 +1990,31 @@ lib/ocaml/sys.ml
 lib/ocaml/sys.mli
 lib/ocaml/threads/condition.cmi
 lib/ocaml/threads/condition.cmti
-${PLIST.native}lib/ocaml/threads/condition.cmx
+${PLIST.ocaml-opt}lib/ocaml/threads/condition.cmx
 lib/ocaml/threads/condition.mli
 lib/ocaml/threads/event.cmi
 lib/ocaml/threads/event.cmti
-${PLIST.native}lib/ocaml/threads/event.cmx
+${PLIST.ocaml-opt}lib/ocaml/threads/event.cmx
 lib/ocaml/threads/event.mli
 lib/ocaml/threads/mutex.cmi
 lib/ocaml/threads/mutex.cmti
-${PLIST.native}lib/ocaml/threads/mutex.cmx
+${PLIST.ocaml-opt}lib/ocaml/threads/mutex.cmx
 lib/ocaml/threads/mutex.mli
 lib/ocaml/threads/semaphore.cmi
 lib/ocaml/threads/semaphore.cmti
-${PLIST.native}lib/ocaml/threads/semaphore.cmx
+${PLIST.ocaml-opt}lib/ocaml/threads/semaphore.cmx
 lib/ocaml/threads/semaphore.mli
 lib/ocaml/threads/thread.cmi
 lib/ocaml/threads/thread.cmti
-${PLIST.native}lib/ocaml/threads/thread.cmx
+${PLIST.ocaml-opt}lib/ocaml/threads/thread.cmx
 lib/ocaml/threads/thread.mli
 lib/ocaml/threads/threadUnix.cmi
 lib/ocaml/threads/threadUnix.cmti
-${PLIST.native}lib/ocaml/threads/threadUnix.cmx
+${PLIST.ocaml-opt}lib/ocaml/threads/threadUnix.cmx
 lib/ocaml/threads/threadUnix.mli
-${PLIST.native}lib/ocaml/threads/threads.a
+${PLIST.ocaml-opt}lib/ocaml/threads/threads.a
 lib/ocaml/threads/threads.cma
-${PLIST.native}lib/ocaml/threads/threads.cmxa
+${PLIST.ocaml-opt}lib/ocaml/threads/threads.cmxa
 lib/ocaml/topdirs.cmi
 lib/ocaml/topdirs.cmt
 lib/ocaml/topdirs.cmti
@@ -2023,17 +2023,17 @@ lib/ocaml/uchar.ml
 lib/ocaml/uchar.mli
 lib/ocaml/unit.ml
 lib/ocaml/unit.mli
-${PLIST.native}lib/ocaml/unix.a
+${PLIST.ocaml-opt}lib/ocaml/unix.a
 lib/ocaml/unix.cma
 lib/ocaml/unix.cmi
 lib/ocaml/unix.cmti
-${PLIST.native}lib/ocaml/unix.cmx
-${PLIST.native}lib/ocaml/unix.cmxa
-${PLIST.native}lib/ocaml/unix.cmxs
+${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.native}lib/ocaml/unixLabels.cmx
+${PLIST.ocaml-opt}lib/ocaml/unixLabels.cmx
 lib/ocaml/unixLabels.mli
 lib/ocaml/weak.ml
 lib/ocaml/weak.mli
diff --git a/ocaml/buildlink3.mk b/ocaml/buildlink3.mk
index 4d59c6a14f..0ca80273ef 100644
--- a/ocaml/buildlink3.mk
+++ b/ocaml/buildlink3.mk
@@ -1,4 +1,5 @@
 # $NetBSD: buildlink3.mk,v 1.56 2021/03/08 08:08:43 jaapb Exp $
+# Should only be used through ocaml.mk, not directly.
 
 BUILDLINK_TREE+=	ocaml
 
diff --git a/ocaml/distinfo b/ocaml/distinfo
index 33015c7672..ddfe36c8f8 100644
--- a/ocaml/distinfo
+++ b/ocaml/distinfo
@@ -1,13 +1,13 @@
 $NetBSD: distinfo,v 1.139 2020/12/10 21:37:07 wiz Exp $
 
-BLAKE2s (ocaml-4.14.0~alpha2.tar.gz) = dc97616665ab9bc303a6f5d180ab0d0591e06998dcd86b814c601e4d9d596cca
-SHA512 (ocaml-4.14.0~alpha2.tar.gz) = 06ef0e2eff358075375775aab06de450da6c49a716898d02f9d146d4328fa1c19d825c34915df8214788025bc2d762cb8be1def31c076455cfacaf066c887ff1
-Size (ocaml-4.14.0~alpha2.tar.gz) = 5366036 bytes
+BLAKE2s (ocaml-4.14.0~beta1.tar.gz) = c4f459fa6215a67a534d3cef8349bfcc62114a4d9b8aad3aefcc52d459373187
+SHA512 (ocaml-4.14.0~beta1.tar.gz) = 4c124611a598427debe1dc694472867dd3514cfa86ab105f29a2551fcae954e0bb6b19af023f881cee5e5bd08bf9bfb37ffa61126f42df15844ced38fc524ce1
+Size (ocaml-4.14.0~beta1.tar.gz) = 5483110 bytes
 SHA1 (patch-Makefile) = 090510112ab849a56a9a2b4722d5d87a01dc29e2
 SHA1 (patch-Makefile.build_config.in) = 38ed679eb5931ecd11274092793a94e1e16d633a
-SHA1 (patch-api__docgen_ocamldoc_Makefile) = 6dd0e336e09017ac80083d7b49f43254d18064e7
+SHA1 (patch-api__docgen_ocamldoc_Makefile) = d1d5aaa159f865ddcccfff334399f0ed908fee7f
 SHA1 (patch-check-linker-version_sh) = c90242556207242ac58499d7f42519a10aedcca4
-SHA1 (patch-configure) = 75855793f32c6aa3e5ce4bc6484605e92a450440
+SHA1 (patch-configure) = 8dbab287166924fc39d858d4aa890b6767432666
 SHA1 (patch-lex_Makefile) = 4f06085be65c5cc17093035de0e18bdb512585a0
 SHA1 (patch-man_Makefile) = c02cfd5b18773bf2156d672705c948bb2eb0d2dc
 SHA1 (patch-ocamldoc_Makefile) = 589f2f8b03ea4ae2ed090a35fd1a303ffe9d1d92
@@ -17,6 +17,7 @@ SHA1 (patch-otherlibs_systhreads_Makefile) = 17e4ff8b8eb7b4fff4570e0c0ded5986c9b
 SHA1 (patch-otherlibs_systhreads_st__stubs.c) = 3c0aa73f0e128646c01ed3855ee9c5645d5fa3f1
 SHA1 (patch-otherlibs_unix_Makefile) = 15425e037b287706b35e3beda72ddea0e2a5886c
 SHA1 (patch-runtime_Makefile) = e97f198f7eefbeeabc481104f71edad68167c956
+SHA1 (patch-runtime_sak.c) = a2c2104c733a107e9129405aa146e1aaef52353f
 SHA1 (patch-testsuite_tests_lib-systhreads_testyield.ml) = 0f6d35e030de168c6f4aeb126055065ed47878aa
 SHA1 (patch-tools_Makefile) = 95db9b6151f89ea900ae7805f3456a19a02f70c0
 SHA1 (patch-tools_ocamlmklib.ml) = 6d468c187608e367e23f418dc68aa4977288a94f
diff --git a/ocaml/native.mk b/ocaml/native.mk
new file mode 100644
index 0000000000..e0619e3650
--- /dev/null
+++ b/ocaml/native.mk
@@ -0,0 +1,48 @@
+# $NetBSD$
+#
+# This Makefile fragment handles the native code compiler options for OCaml.
+# It is used by ocaml.mk and the lang/ocaml package.
+#
+# Build def variables:
+# OCAML_USE_OPT_COMPILER 
+# if set to yes, will enable optimised (native code) compilation
+# default value: depends on architecture
+#
+# PLIST variable:
+# PLIST.ocaml-opt for files only installed when using the optimised compiler
+# Set based on OCAML_USE_OPT_COMPILER
+# 
+
+.if !defined(OCAML_NATIVE_MK)
+OCAML_NATIVE_MK= # defined
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+BUILD_DEFS+=	OCAML_USE_OPT_COMPILER
+
+_VARGROUPS+=	ocaml
+_DEF_VARS.ocaml=	\
+	OCAML_USE_OPT_COMPILER
+
+# Default value of OCAML_USE_OPT_COMPILER
+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
+     !empty(MACHINE_ARCH:M*arm*) || (${MACHINE_ARCH} == "aarch64") || \
+     (${MACHINE_ARCH} == "x86_64")
+OCAML_USE_OPT_COMPILER?=	yes
+.else
+OCAML_USE_OPT_COMPILER?=	no
+.endif
+
+# Things that get installed with the opt compiler
+PLIST_VARS+=	ocaml-opt
+
+.if ${OCAML_USE_OPT_COMPILER} == "yes"
+# The opt compiler needs the C compiler suite
+USE_LANGUAGES+=	c
+PLIST.ocaml-opt=	yes
+.else
+# If we're bytecode compiling, don't strip executables
+INSTALL_UNSTRIPPED=	yes
+.endif
+
+.endif # OCAML_NATIVE_MK
diff --git a/ocaml/ocaml.mk b/ocaml/ocaml.mk
new file mode 100644
index 0000000000..369e1b754c
--- /dev/null
+++ b/ocaml/ocaml.mk
@@ -0,0 +1,252 @@
+# $NetBSD: ocaml.mk,v 1.31 2022/02/14 11:37:48 wiz Exp $
+#
+# This Makefile fragment handles the common variables used by OCaml packages.
+# It should be included by every package that uses OCaml.
+#
+# Package-settable variables:
+# OCAML_USE_FINDLIB
+# package uses findlib infrastructure
+# OCAML_FINDLIB_DIRS
+# directories under OCAML_SITELIBDIR that this package installs into
+# OCAML_FINDLIB_REGISTER
+# register findlib directories into OCaml ld.conf
+# OCAML_USE_OASIS [implies OCAML_USE_FINDLIB]
+# package uses oasis infrastructure
+# OCAML_USE_OASIS_DYNRUN [implies OCAML_USE_OASIS]
+# package uses oasis.dynrun
+# OCAML_USE_OPAM
+# package uses OPAM installer [implies OCAML_USE_FINDLIB]
+# OCAML_USE_TOPKG
+# package uses topkg [implies OCAML_USE_FINDLIB]
+# OCAML_USE_DUNE
+# package uses dune [implies OCAML_USE_OPAM]
+# OCAML_TOPKG_DOCDIR
+# different targets for topkg (bytecode, optional bytecode, native)
+# OASIS_BUILD_ARGS
+# arguments for oasis build
+# Set by this file:
+# OCAML_SITELIBDIR
+
+.if !defined(OCAML_MK)
+OCAML_MK= # defined
+
+# Text relocations errors when building packages that use
+# ocamlfind on i386.
+MKPIE_SUPPORTED=	no
+
+.include "../../mk/bsd.fast.prefs.mk"
+.include "../../wip/ocaml/native.mk"
+
+
+_PKG_VARS.ocaml=	\
+	OCAML_USE_FINDLIB \
+	OCAML_FINDLIB_DIRS \
+	OCAML_FINDLIB_REGISTER \
+	OCAML_USE_OASIS \
+	OCAML_USE_OASIS_DYNRUN \
+	OASIS_BUILD_ARGS \
+	OCAML_USE_OPAM \
+	OCAML_USE_TOPKG \
+	OCAML_TOPKG_NAME \
+	OCAML_TOPKG_DOCDIR \
+	OCAML_TOPKG_FLAGS \
+	OCAML_TOPKG_TARGETS \
+	OCAML_TOPKG_OPTIONAL_TARGETS \
+	OCAML_USE_DUNE \
+	DUNE_BUILD_FLAGS \
+	DUNE_BUILD_PACKAGES \
+	DUNE_BUILD_TARGETS \
+	OCAML_BUILD_ARGS \
+	OPAM_INSTALL_DIR \
+	OPAM_INSTALL_FILES
+_SYS_VARS.ocaml=	\
+	OCAML_SITELIBDIR
+
+# Default value of OCAML_USE_FINDLIB
+OCAML_USE_FINDLIB?=	no
+
+# Default value of OCAML_USE_OASIS
+OCAML_USE_OASIS?=	no
+
+# Default value of OCAML_USE_OASIS_DYNRUN
+OCAML_USE_OASIS_DYNRUN?=	no
+
+# Default value of OCAML_USE_TOPKG
+OCAML_USE_TOPKG?=	no
+
+# Default value of OCAML_USE_DUNE
+OCAML_USE_DUNE?=	no
+
+OCAML_TOPKG_NAME?=	${PKGBASE:S/^ocaml-//}
+OCAML_TOPKG_DOCDIR?=	${PREFIX}/share/doc
+OCAML_TOPKG_FLAGS?=	# empty
+OCAML_TOPKG_TARGETS?=	# empty
+OCAML_TOPKG_OPTIONAL_TARGETS?=	# empty
+OCAML_TOPKG_NATIVE_TARGETS?=	# empty
+
+OPAM_INSTALL_FILES?=	${OCAML_TOPKG_NAME}
+DUNE_BUILD_FLAGS?=	# empty
+DUNE_BUILD_TARGETS?=	@install
+DUNE_BUILD_PACKAGES?=	# empty
+
+# Default value of OASIS_BUILD_ARGS
+OASIS_BUILD_ARGS?=	# empty
+
+#
+# Configure stuff for OASIS_DYNRUN
+#
+.if ${OCAML_USE_OASIS_DYNRUN} == "yes"
+.include "../../devel/ocaml-oasis/buildlink3.mk"
+OCAML_USE_OASIS=	yes
+.endif
+
+#
+# Configure stuff for OASIS
+#
+.if ${OCAML_USE_OASIS} == "yes"
+OCAML_USE_FINDLIB=	yes
+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"
+CONFIGURE_ARGS+=	--override is_native true
+.else
+CONFIGURE_ARGS+=	--override is_native false
+.endif
+.endif
+
+# Configure stuff for DUNE
+.if ${OCAML_USE_DUNE} == "yes"
+.include "../../devel/ocaml-dune/buildlink3.mk"
+OCAML_USE_OPAM?=	yes
+OPAM_INSTALL_DIR?=	_build/default
+.else
+OCAML_USE_OPAM?=	no
+.endif
+
+# Configure stuff for OPAM
+.if ${OCAML_USE_OPAM} == "yes"
+.include "../../misc/ocaml-opaline/buildlink3.mk"
+OCAML_USE_FINDLIB=	yes
+.endif
+
+# Configure stuff for TOPKG
+.if ${OCAML_USE_TOPKG} == "yes"
+.include "../../misc/ocaml-topkg/buildlink3.mk"
+OCAML_USE_FINDLIB=	yes
+INSTALLATION_DIRS+=	${OCAML_SITELIBDIR}/${OCAML_TOPKG_NAME}
+.endif
+
+# Fallback value for OPAM_INSTALL_DIR
+OPAM_INSTALL_DIR?=	.
+
+# Value for OCAML_SITELIBDIR
+OCAML_SITELIBDIR=	lib/ocaml/site-lib
+MAKE_ENV+=	OCAML_SITELIBDIR="${OCAML_SITELIBDIR}"
+PLIST_SUBST+=	OCAML_SITELIB="${OCAML_SITELIBDIR}"
+
+PRINT_PLIST_AWK+=	{ gsub(/^.+\.cmx/, "$${PLIST.ocaml-opt}&") }
+PRINT_PLIST_AWK+=	{ gsub(/^.+\.a$$/, "$${PLIST.ocaml-opt}&") }
+PRINT_PLIST_AWK+=	{ gsub(/${OCAML_SITELIBDIR:S|/|\\/|g}/, \
+			"$${OCAML_SITELIB}"); \
+			print; next; }
+
+.if ${OCAML_USE_FINDLIB} == "yes"
+.include "../../devel/ocaml-findlib/buildlink3.mk"
+INSTALLATION_DIRS+=	${OCAML_SITELIBDIR}
+OCAML_FINDLIB_DIRS?=	${PKGBASE:S/^ocaml-//}
+OCAML_FINDLIB_REGISTER?=	yes
+.endif
+
+#
+# Compiler stuff
+#
+
+#
+# OASIS targets
+#
+.if ${OCAML_USE_OASIS} == "yes"
+# OASIS uses ocamlbuild
+.include "../../devel/ocamlbuild/buildlink3.mk"
+.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
+OASIS_EXEC=ocaml setup.ml
+.endif
+
+# Redefine configure target
+do-configure:
+	${RUN} cd ${WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} ${OASIS_EXEC} -configure ${CONFIGURE_ARGS}
+
+# Redefine build target
+do-build:
+	${RUN} ${_ULIMIT_CMD} cd ${WRKSRC} && \
+		${SETENV} ${MAKE_ENV} ${OASIS_EXEC} -build ${OASIS_BUILD_ARGS}
+
+# Redefine install target
+do-install:
+	${RUN} cd ${WRKSRC} && \
+		${OASIS_EXEC} -install --destdir ${DESTDIR} --prefix ${PREFIX}
+.endif
+
+#
+# topkg targets
+#
+.if ${OCAML_USE_TOPKG} == "yes"
+
+do-build:
+	${RUN} ${_ULIMIT_CMD} cd ${WRKSRC} && \
+		${SETENV} ${MAKE_ENV} ocaml pkg/pkg.ml build ${OCAML_TOPKG_FLAGS}
+
+.endif # topkg
+
+#
+# opam targets
+#
+.if ${OCAML_USE_OPAM} == "yes" 
+
+do-install:
+	${RUN} for i in ${OPAM_INSTALL_FILES}; do \
+		cd ${WRKSRC} && opaline -install-cmd "${INSTALL_DATA}" \
+		-exec-install-cmd "${INSTALL_PROGRAM}" \
+		-name $$i \
+		-destdir ${DESTDIR} \
+		-prefix ${PREFIX} \
+		-libdir ${PREFIX}/${OCAML_SITELIBDIR} \
+		-docdir ${OCAML_TOPKG_DOCDIR}/$$i \
+		-stublibsdir ${PREFIX}/${OCAML_SITELIBDIR}/stublibs \
+		-bindir ${PREFIX}/bin \
+		${OPAM_INSTALL_DIR}/$$i.install; \
+	done
+
+.endif # opam
+
+#
+# dune targets
+#
+.if ${OCAML_USE_DUNE} == "yes"
+
+do-build:
+.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
+	${RUN} ${_ULIMIT_CMD} \
+		cd ${WRKSRC} && dune build --profile release -j ${MAKE_JOBS:U1} \
+		${DUNE_BUILD_FLAGS} ${DUNE_BUILD_TARGETS}
+.endif
+
+.endif # dune
+
+# Add dependency on ocaml.
+.include "../../lang/ocaml/buildlink3.mk"
+
+.endif # OCAML_MK
diff --git a/ocaml/options.mk b/ocaml/options.mk
index 2afe0c3a92..58632b2d37 100644
--- a/ocaml/options.mk
+++ b/ocaml/options.mk
@@ -1,9 +1,9 @@
 # $NetBSD: options.mk,v 1.5 2020/12/09 10:33:04 jaapb Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ocaml
-PKG_SUPPORTED_OPTIONS=	pic flambda native
+PKG_SUPPORTED_OPTIONS=	pic flambda
 PKG_SUGGESTED_OPTIONS=	pic
-PLIST_VARS+=	pic flambda native
+PLIST_VARS+=	pic flambda ocaml-native
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
@@ -19,12 +19,3 @@ CONFIGURE_ARGS+=	--enable-flambda
 .else
 CONFIGURE_ARGS+=	--disable-flambda
 .endif
-
-.if !empty(PKG_OPTIONS:Mnative)
-CONFIGURE_ARGS+=	--enable-native-compiler
-BUILD_TARGET=		world.opt
-PLIST.native=		yes	
-.else
-CONFIGURE_ARGS+=	--disable-native-compiler
-BUILD_TARGET=		world
-.endif
diff --git a/ocaml/patches/patch-api__docgen_ocamldoc_Makefile b/ocaml/patches/patch-api__docgen_ocamldoc_Makefile
index bbc1d0c493..6fbabe258e 100644
--- a/ocaml/patches/patch-api__docgen_ocamldoc_Makefile
+++ b/ocaml/patches/patch-api__docgen_ocamldoc_Makefile
@@ -1,9 +1,9 @@
 $NetBSD$
 
---- api_docgen/ocamldoc/Makefile.orig	2022-02-08 16:50:12.000000000 +0000
+--- api_docgen/ocamldoc/Makefile.orig	2022-02-21 15:57:25.000000000 +0000
 +++ api_docgen/ocamldoc/Makefile
-@@ -17,7 +17,7 @@ include $(ROOTDIR)/ocamldoc/Makefile.bes
- vpath %.mli $(ROOTDIR)/stdlib $(DOC_COMPILERLIBS_DIRS)  $(DOC_STDLIB_DIRS)
+@@ -19,7 +19,7 @@ include ../../ocamldoc/Makefile.best_oca
+ vpath %.mli ../../stdlib $(DOC_COMPILERLIBS_DIRS)  $(DOC_STDLIB_DIRS)
  
  
 -man: build/man/Stdlib.3o
@@ -11,7 +11,7 @@ $NetBSD$
  latex: build/latex/Stdlib.tex
  html: \
    build/html/libref/Stdlib.html \
-@@ -32,7 +32,7 @@ DOC_ALL_INCLUDES = \
+@@ -34,7 +34,7 @@ DOC_ALL_INCLUDES = \
  
  libref=$(stdlib_UNPREFIXED) $(otherlibref)
  
@@ -20,7 +20,7 @@ $NetBSD$
  ALL_LATEX= $(ALL_DOC:%=build/latex/%.tex)
  
  build/latex/ifocamldoc.tex: | build/latex
-@@ -58,7 +58,7 @@ build/libref/%.odoc: $(DOCGEN)/%.mld | b
+@@ -60,7 +60,7 @@ build/libref/%.odoc: build/%.mld | build
  	$(OCAMLDOC_RUN) $(DOC_STDLIB_INCLUDES) -text $< -dump  $@
  
  ALL_COMPILED_DOC=$(ALL_DOC:%=build/%.odoc)
@@ -29,7 +29,7 @@ $NetBSD$
  	$(OCAMLDOC_RUN) -man -d build/man -man-mini \
  	-nostdlib -hide Stdlib -lib Stdlib -t "OCaml library" \
  	$(addprefix -load , $(ALL_COMPILED_DOC))
-@@ -121,5 +121,5 @@ build/latex/compilerlibs_input.tex: | bu
+@@ -123,5 +123,5 @@ build/latex/compilerlibs_input.tex: | bu
  install:
  	$(MKDIR) "$(INSTALL_LIBRARIES_MAN_DIR)"
  	if test -d build/man; then \
diff --git a/ocaml/patches/patch-configure b/ocaml/patches/patch-configure
index 0e6eea20ee..1c569d3317 100644
--- a/ocaml/patches/patch-configure
+++ b/ocaml/patches/patch-configure
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- configure.orig	2022-02-08 16:50:12.000000000 +0000
+--- configure.orig	2022-02-21 15:57:25.000000000 +0000
 +++ configure
 @@ -14081,7 +14081,7 @@ sharedlib_cflags=''
  mksharedlib='shared-libs-not-available'
@@ -11,7 +11,7 @@ $NetBSD$
  
  if test x"$enable_shared" != "xno"; then :
    case $host in #(
-@@ -14153,6 +14153,8 @@ if test x"$supports_shared_libraries" = 
+@@ -14157,6 +14157,8 @@ if test x"$supports_shared_libraries" = 
      natdynlink=true ;; #(
    *-pc-windows) :
      natdynlink=true ;; #(
@@ -20,7 +20,7 @@ $NetBSD$
    i[3456]86-*-linux*) :
      natdynlink=true ;; #(
    i[3456]86-*-gnu*) :
-@@ -14187,6 +14189,8 @@ if test x"$supports_shared_libraries" = 
+@@ -14191,6 +14193,8 @@ if test x"$supports_shared_libraries" = 
      natdynlink=true ;; #(
    i[3456]86-*-netbsd*) :
      natdynlink=true ;; #(
@@ -29,7 +29,7 @@ $NetBSD$
    x86_64-*-netbsd*) :
      natdynlink=true ;; #(
    i386-*-gnu0.3) :
-@@ -14197,12 +14201,16 @@ if test x"$supports_shared_libraries" = 
+@@ -14201,12 +14205,16 @@ if test x"$supports_shared_libraries" = 
      natdynlink=true ;; #(
    arm*-*-freebsd*) :
      natdynlink=true ;; #(
@@ -43,10 +43,10 @@ $NetBSD$
      natdynlink=true ;; #(
 +  aarch64-*-netbsd*) :
 +    natdynlink=true ;; #(
-   riscv*-*-linux*) :
+   aarch64-*-openbsd*) :
      natdynlink=true ;; #(
-   *) :
-@@ -14309,6 +14317,8 @@ case $host in #(
+   riscv*-*-linux*) :
+@@ -14315,6 +14323,8 @@ case $host in #(
      arch=i386; system=beos ;; #(
    i[3456]86-*-cygwin) :
      arch=i386; system=cygwin ;; #(
@@ -55,7 +55,7 @@ $NetBSD$
    i[3456]86-*-gnu*) :
      arch=i386; system=gnu ;; #(
    i[3456]86-*-mingw32) :
-@@ -14325,6 +14335,8 @@ case $host in #(
+@@ -14331,6 +14341,8 @@ case $host in #(
  else
    model=ppc
  fi; system=elf ;; #(
@@ -64,7 +64,7 @@ $NetBSD$
    s390x*-*-linux*) :
      arch=s390x; model=z10; system=elf ;; #(
    # expected to match "gnueabihf" as well as "musleabihf"
-@@ -14344,6 +14356,10 @@ fi; system=elf ;; #(
+@@ -14350,6 +14362,10 @@ fi; system=elf ;; #(
      arch=arm; model=armv6; system=linux_eabi ;; #(
    armv6*-*-freebsd*) :
      arch=arm; model=armv6; system=freebsd ;; #(
@@ -75,20 +75,22 @@ $NetBSD$
    earmv6*-*-netbsd*) :
      arch=arm; model=armv6; system=netbsd ;; #(
    earmv7*-*-netbsd*) :
-@@ -14388,8 +14404,12 @@ fi; system=elf ;; #(
+@@ -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=amd64; system=solaris ;; #(
++    arch=arm64; system=solaris ;; #(
    riscv64-*-linux*) :
      arch=riscv; model=riscv64; system=linux
   ;; #(
-@@ -14605,6 +14625,9 @@ case $as_target,$ocaml_cv_cc_vendor in #
+@@ -14613,6 +14633,9 @@ case $as_target,$ocaml_cv_cc_vendor in #
    *) :
       ;;
  esac ;; #(
@@ -98,7 +100,7 @@ $NetBSD$
    i686-pc-windows,*) :
      default_as="ml -nologo -coff -Cp -c -Fo"
      default_aspp="$default_as" ;; #(
-@@ -15215,6 +15238,64 @@ if test "x$ac_cv_func_socketpair" = xyes
+@@ -15223,6 +15246,64 @@ if test "x$ac_cv_func_socketpair" = xyes
  
  fi
   ;; #(
@@ -163,7 +165,7 @@ $NetBSD$
    *-*-haiku) :
      cclibs="$cclibs -lnetwork"
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
-@@ -17366,7 +17447,7 @@ as_has_debug_prefix_map=false
+@@ -17374,7 +17455,7 @@ as_has_debug_prefix_map=false
  asm_cfi_supported=false
  if $native_compiler; then :
    case $host in #(
diff --git a/ocaml/patches/patch-runtime_sak.c b/ocaml/patches/patch-runtime_sak.c
new file mode 100644
index 0000000000..9112d184c7
--- /dev/null
+++ b/ocaml/patches/patch-runtime_sak.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- 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);
+     }
+   }


Home | Main Index | Thread Index | Old Index