Updated ocaml to version 4.12.0.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Updated ocaml to version 4.12.0.
From: Jaap Boender <jaapb%NetBSD.org@localhost>
Date: Mon, 08 Mar 2021 20:19:08 +0000
Module Name:	pkgsrc-wip
Committed By:	Jaap Boender <jaapb%NetBSD.org@localhost>
Pushed By:	jaapb
Date:		Mon Mar 8 21:19:08 2021 +0100
Changeset:	ad0f755df4151934ae3053224dfe3f46f8f3aa7e

Modified Files:
	ocaml/Makefile
	ocaml/Makefile.common
	ocaml/PLIST
	ocaml/buildlink3.mk
	ocaml/distinfo
	ocaml/files/wrapper.sh
	ocaml/hacks.mk
	ocaml/options.mk
	ocaml/patches/patch-Makefile
	ocaml/patches/patch-configure
	ocaml/patches/patch-lex_Makefile
	ocaml/patches/patch-ocamldoc_Makefile
	ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
	ocaml/patches/patch-otherlibs_systhreads_Makefile
	ocaml/patches/patch-otherlibs_systhreads_st__stubs.c
	ocaml/patches/patch-runtime_Makefile
	ocaml/patches/patch-testsuite_tests_lib-systhreads_testyield.ml
	ocaml/patches/patch-tools_Makefile
	ocaml/patches/patch-tools_ocamlmklib.ml
	ocaml/patches/patch-yacc_Makefile
Added Files:
	ocaml/patches/patch-Makefile.build_config.in
Removed Files:
	ocaml/patches/patch-Makefile.common.in
	ocaml/patches/patch-asmcomp_amd64_emit.mlp
	ocaml/patches/patch-runtime_amd64.S

Log Message:
Updated ocaml to version 4.12.0.

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

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

diffstat:
 ocaml/Makefile                                     |  10 +-
 ocaml/Makefile.common                              |   6 +-
 ocaml/PLIST                                        | 256 ++++++---------------
 ocaml/buildlink3.mk                                |   8 +-
 ocaml/distinfo                                     |  22 +-
 ocaml/files/wrapper.sh                             |  34 +--
 ocaml/hacks.mk                                     |   2 +-
 ocaml/options.mk                                   |   2 +-
 ocaml/patches/patch-Makefile                       |  25 +-
 ocaml/patches/patch-Makefile.build_config.in       |  17 ++
 ocaml/patches/patch-Makefile.common.in             |  19 --
 ocaml/patches/patch-asmcomp_amd64_emit.mlp         |  24 --
 ocaml/patches/patch-configure                      |  42 ++--
 ocaml/patches/patch-lex_Makefile                   |  22 +-
 ocaml/patches/patch-ocamldoc_Makefile              |   2 +-
 .../patch-otherlibs_Makefile.otherlibs.common      |   8 +-
 ocaml/patches/patch-otherlibs_systhreads_Makefile  |   2 +-
 .../patches/patch-otherlibs_systhreads_st__stubs.c |   2 +-
 ocaml/patches/patch-runtime_Makefile               |   2 +-
 ocaml/patches/patch-runtime_amd64.S                |  15 --
 ...tch-testsuite_tests_lib-systhreads_testyield.ml |   2 +-
 ocaml/patches/patch-tools_Makefile                 |   2 +-
 ocaml/patches/patch-tools_ocamlmklib.ml            |   2 +-
 ocaml/patches/patch-yacc_Makefile                  |   2 +-
 24 files changed, 177 insertions(+), 351 deletions(-)

diffs:
diff --git a/ocaml/Makefile b/ocaml/Makefile
index 3099aa3250..64bd426f87 100644
--- a/ocaml/Makefile
+++ b/ocaml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.137 2020/12/08 08:53:16 he Exp $
+# $NetBSD: Makefile,v 1.141 2020/12/26 08:36:18 nia Exp $
 
 .include "Makefile.common"
 
@@ -51,7 +51,8 @@ PLIST.ocaml-prof=	yes
 # XXX This conditional is not complete.  It should match the
 # conditional in ocaml-x.y.z/configure.
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64") || \
-    (${MACHINE_ARCH} == "aarch64") || (${MACHINE_ARCH} == "powerpc")
+    (${MACHINE_ARCH} == "aarch64") || (${MACHINE_ARCH} == "powerpc") || \
+    !empty(MACHINE_ARCH:Mearm*)
 .  if !empty(MACHINE_PLATFORM:MLinux-*-*) || \
       !empty(MACHINE_PLATFORM:MFreeBSD-*-*) || \
       !empty(MACHINE_PLATFORM:MDragonFly-*-*) || \
@@ -93,11 +94,6 @@ EXTRA_RT_LIBS.*=
 
 PRINT_PLIST_AWK+=	{ gsub(/lib\/ocaml\/${PKGMANDIR:S|/|\\/|}/, "lib/ocaml/$${PKGMANDIR}"); }
 
-.if defined(PLIST.instrumented_runtime)
-REPLACE_BASH+=		tools/ocaml-instr-graph
-REPLACE_AWK+=		tools/ocaml-instr-report
-.endif
-
 do-test:
 	cd ${WRKSRC} && ${MAKE_PROGRAM} ${TEST_PROGRAM}
 	cd ${WRKSRC}/testsuite && ${MAKE_PROGRAM} all
diff --git a/ocaml/Makefile.common b/ocaml/Makefile.common
index 8189d0ea73..028e0376cf 100644
--- a/ocaml/Makefile.common
+++ b/ocaml/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.55 2018/11/12 16:09:34 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.62 2021/03/08 08:08:43 jaapb Exp $
 
 # used by x11/labltk/Makefile
-DISTNAME=	ocaml-4.11.1
+DISTNAME=	ocaml-4.12.0
 CATEGORIES=	lang
-MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-4.11/
+MASTER_SITES=	http://caml.inria.fr/pub/distrib/ocaml-4.12/
 #EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jaapb%NetBSD.org@localhost
diff --git a/ocaml/PLIST b/ocaml/PLIST
index ce7c8f1b4e..a7074d4a92 100644
--- a/ocaml/PLIST
+++ b/ocaml/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.49 2018/10/16 00:19:40 gdt Exp $
+@comment $NetBSD: PLIST,v 1.55 2021/03/08 08:08:43 jaapb Exp $
 bin/ocaml
-@comment ${PLIST.instrumented_runtime}bin/ocaml-instr-graph
-@comment ${PLIST.instrumented_runtime}bin/ocaml-instr-report
 bin/ocamlc
 bin/ocamlc.byte
 ${PLIST.ocaml-opt}bin/ocamlc.opt
@@ -41,13 +39,14 @@ bin/ocamlrund
 ${PLIST.instrumented_runtime}bin/ocamlruni
 bin/ocamlyacc
 lib/ocaml/Makefile.config
-lib/ocaml/VERSION
 lib/ocaml/arg.ml
 lib/ocaml/arg.mli
 lib/ocaml/array.ml
 lib/ocaml/array.mli
 lib/ocaml/arrayLabels.ml
 lib/ocaml/arrayLabels.mli
+lib/ocaml/atomic.ml
+lib/ocaml/atomic.mli
 ${PLIST.ocaml-opt}lib/ocaml/bigarray.a
 lib/ocaml/bigarray.cma
 lib/ocaml/bigarray.cmi
@@ -73,6 +72,7 @@ lib/ocaml/caml/backtrace.h
 lib/ocaml/caml/backtrace_prim.h
 lib/ocaml/caml/bigarray.h
 lib/ocaml/caml/callback.h
+lib/ocaml/caml/codefrag.h
 lib/ocaml/caml/compact.h
 lib/ocaml/caml/compare.h
 lib/ocaml/caml/compatibility.h
@@ -96,9 +96,6 @@ lib/ocaml/caml/hash.h
 lib/ocaml/caml/hooks.h
 lib/ocaml/caml/instrtrace.h
 lib/ocaml/caml/instruct.h
-@comment 4.09 lib/ocaml/caml/int64_emul.h
-@comment 4.09 lib/ocaml/caml/int64_format.h
-@comment 4.09 lib/ocaml/caml/int64_native.h
 lib/ocaml/caml/interp.h
 lib/ocaml/caml/intext.h
 lib/ocaml/caml/io.h
@@ -120,8 +117,8 @@ lib/ocaml/caml/roots.h
 lib/ocaml/caml/s.h
 lib/ocaml/caml/signals.h
 lib/ocaml/caml/signals_machdep.h
+lib/ocaml/caml/skiplist.h
 lib/ocaml/caml/socketaddr.h
-lib/ocaml/caml/spacetime.h
 lib/ocaml/caml/stack.h
 lib/ocaml/caml/stacks.h
 lib/ocaml/caml/startup.h
@@ -136,46 +133,42 @@ lib/ocaml/camlheader
 lib/ocaml/camlheader_ur
 lib/ocaml/camlheaderd
 lib/ocaml/camlheaderi
+lib/ocaml/camlinternalAtomic.cmi
+lib/ocaml/camlinternalAtomic.cmt
+lib/ocaml/camlinternalAtomic.cmti
+${PLIST.ocaml-opt}lib/ocaml/camlinternalAtomic.cmx
+lib/ocaml/camlinternalAtomic.ml
+lib/ocaml/camlinternalAtomic.mli
 lib/ocaml/camlinternalFormat.cmi
 lib/ocaml/camlinternalFormat.cmt
 lib/ocaml/camlinternalFormat.cmti
 ${PLIST.ocaml-opt}lib/ocaml/camlinternalFormat.cmx
 lib/ocaml/camlinternalFormat.ml
 lib/ocaml/camlinternalFormat.mli
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/camlinternalFormat.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalFormat.p.cmx
 lib/ocaml/camlinternalFormatBasics.cmi
 lib/ocaml/camlinternalFormatBasics.cmt
 lib/ocaml/camlinternalFormatBasics.cmti
 ${PLIST.ocaml-opt}lib/ocaml/camlinternalFormatBasics.cmx
 lib/ocaml/camlinternalFormatBasics.ml
 lib/ocaml/camlinternalFormatBasics.mli
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/camlinternalFormatBasics.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalFormatBasics.p.cmx
 lib/ocaml/camlinternalLazy.cmi
 lib/ocaml/camlinternalLazy.cmt
 lib/ocaml/camlinternalLazy.cmti
 ${PLIST.ocaml-opt}lib/ocaml/camlinternalLazy.cmx
 lib/ocaml/camlinternalLazy.ml
 lib/ocaml/camlinternalLazy.mli
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/camlinternalLazy.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalLazy.p.cmx
 lib/ocaml/camlinternalMod.cmi
 lib/ocaml/camlinternalMod.cmt
 lib/ocaml/camlinternalMod.cmti
 ${PLIST.ocaml-opt}lib/ocaml/camlinternalMod.cmx
 lib/ocaml/camlinternalMod.ml
 lib/ocaml/camlinternalMod.mli
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/camlinternalMod.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalMod.p.cmx
 lib/ocaml/camlinternalOO.cmi
 lib/ocaml/camlinternalOO.cmt
 lib/ocaml/camlinternalOO.cmti
 ${PLIST.ocaml-opt}lib/ocaml/camlinternalOO.cmx
 lib/ocaml/camlinternalOO.ml
 lib/ocaml/camlinternalOO.mli
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/camlinternalOO.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/camlinternalOO.p.cmx
 lib/ocaml/char.ml
 lib/ocaml/char.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/CSE.cmi
@@ -278,6 +271,11 @@ ${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/binutils.cmi
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/binutils.cmt
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/binutils.cmti
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/binutils.cmx
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/binutils.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/branch_relaxation.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/branch_relaxation.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/branch_relaxation.cmti
@@ -448,26 +446,6 @@ ${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
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink.cmi
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink.cmt
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink.cmti
-@comment 4.09 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink.cmx
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink.mli
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_common.cmi
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_common.cmt
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_common.cmti
-@comment 4.09 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_common.cmx
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_common.mli
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_platform_intf.cmi
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_platform_intf.cmt
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_platform_intf.cmti
-@comment 4.09 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_platform_intf.cmx
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_platform_intf.mli
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_types.cmi
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_types.cmt
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_types.cmti
-@comment 4.09 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/compdynlink_types.cmx
-@comment 4.09 lib/ocaml/compiler-libs/compdynlink_types.mli
 lib/ocaml/compiler-libs/compenv.cmi
 lib/ocaml/compiler-libs/compenv.cmt
 lib/ocaml/compiler-libs/compenv.cmti
@@ -805,6 +783,11 @@ ${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linear_format.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmt
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/linearize.cmti
@@ -830,6 +813,11 @@ lib/ocaml/compiler-libs/load_path.cmt
 lib/ocaml/compiler-libs/load_path.cmti
 ${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.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
@@ -848,15 +836,18 @@ ${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
-lib/ocaml/compiler-libs/main.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/main.cmx
-lib/ocaml/compiler-libs/main.mli
 ${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.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.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
@@ -928,10 +919,13 @@ lib/ocaml/compiler-libs/opterrors.mli
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmain.cmi
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmain.cmo
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmain.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmain.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmain.cmx
-lib/ocaml/compiler-libs/optmain.mli
 ${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
+${PLIST.ocaml-opt}lib/ocaml/compiler-libs/optmaindriver.mli
 lib/ocaml/compiler-libs/opttopdirs.mli
 lib/ocaml/compiler-libs/opttoploop.mli
 lib/ocaml/compiler-libs/opttopmain.mli
@@ -971,6 +965,11 @@ lib/ocaml/compiler-libs/path.cmt
 lib/ocaml/compiler-libs/path.cmti
 ${PLIST.ocaml-opt}lib/ocaml/compiler-libs/path.cmx
 lib/ocaml/compiler-libs/path.mli
+lib/ocaml/compiler-libs/patterns.cmi
+lib/ocaml/compiler-libs/patterns.cmt
+lib/ocaml/compiler-libs/patterns.cmti
+${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
@@ -1194,11 +1193,6 @@ ${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/spacetime_profiling.cmi
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/spacetime_profiling.cmt
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/spacetime_profiling.cmti
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/spacetime_profiling.cmx
-${PLIST.ocaml-opt}lib/ocaml/compiler-libs/spacetime_profiling.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
@@ -1481,6 +1475,12 @@ ${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_common.cmx
 ${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_compilerlibs.cmx
 ${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_platform_intf.cmx
 ${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_types.cmx
+lib/ocaml/either.ml
+lib/ocaml/either.mli
+lib/ocaml/stdlib__ephemeron.cmi
+lib/ocaml/stdlib__ephemeron.cmt
+lib/ocaml/stdlib__ephemeron.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__ephemeron.cmx
 lib/ocaml/ephemeron.ml
 lib/ocaml/ephemeron.mli
 lib/ocaml/eventlog_metadata
@@ -1516,14 +1516,12 @@ ${PLIST.ocaml-opt}lib/ocaml/libasmrun_pic.a
 ${PLIST.ocaml-opt}lib/ocaml/libasmrun_shared.so
 ${PLIST.ocaml-opt}lib/ocaml/libasmrund.a
 ${PLIST.instrumented_runtime}${PLIST.ocaml-opt}lib/ocaml/libasmruni.a
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/libasmrunp.a
 lib/ocaml/libcamlrun.a
 lib/ocaml/libcamlrun_pic.a
 lib/ocaml/libcamlrun_shared.so
 lib/ocaml/libcamlrund.a
 ${PLIST.instrumented_runtime}lib/ocaml/libcamlruni.a
 lib/ocaml/libcamlstr.a
-${PLIST.ocaml-spacetime}${PLIST.ocaml-opt}lib/ocaml/libraw_spacetime_lib.a
 lib/ocaml/libthreads.a
 ${PLIST.ocaml-opt}lib/ocaml/libthreadsnat.a
 lib/ocaml/libunix.a
@@ -1541,7 +1539,6 @@ lib/ocaml/nativeint.ml
 lib/ocaml/nativeint.mli
 lib/ocaml/obj.ml
 lib/ocaml/obj.mli
-lib/ocaml/objinfo_helper
 lib/ocaml/ocamldoc/ocamldoc.hva
 lib/ocaml/ocamldoc/odoc.cmi
 ${PLIST.ocaml-opt}lib/ocaml/ocamldoc/odoc.cmx
@@ -1665,14 +1662,6 @@ lib/ocaml/queue.ml
 lib/ocaml/queue.mli
 lib/ocaml/random.ml
 lib/ocaml/random.mli
-${PLIST.ocaml-spacetime}${PLIST.ocaml-opt}lib/ocaml/raw_spacetime_lib.a
-${PLIST.ocaml-spacetime}lib/ocaml/raw_spacetime_lib.cma
-${PLIST.ocaml-spacetime}lib/ocaml/raw_spacetime_lib.cmi
-${PLIST.ocaml-spacetime}lib/ocaml/raw_spacetime_lib.cmti
-${PLIST.ocaml-spacetime}${PLIST.ocaml-opt}lib/ocaml/raw_spacetime_lib.cmx
-${PLIST.ocaml-spacetime}${PLIST.ocaml-opt}lib/ocaml/raw_spacetime_lib.cmxa
-${PLIST.ocaml-nat}${PLIST.ocaml-spacetime}${PLIST.ocaml-opt}lib/ocaml/raw_spacetime_lib.cmxs
-${PLIST.ocaml-spacetime}lib/ocaml/raw_spacetime_lib.mli
 lib/ocaml/result.ml
 lib/ocaml/result.mli
 lib/ocaml/scanf.ml
@@ -1681,8 +1670,6 @@ lib/ocaml/seq.ml
 lib/ocaml/seq.mli
 lib/ocaml/set.ml
 lib/ocaml/set.mli
-lib/ocaml/spacetime.ml
-lib/ocaml/spacetime.mli
 lib/ocaml/stack.ml
 lib/ocaml/stack.mli
 lib/ocaml/stdLabels.ml
@@ -1693,9 +1680,6 @@ lib/ocaml/std_exit.cmt
 ${PLIST.ocaml-opt}lib/ocaml/std_exit.cmx
 lib/ocaml/std_exit.ml
 ${PLIST.ocaml-opt}lib/ocaml/std_exit.o
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/std_exit.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/std_exit.p.cmx
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/std_exit.p.o
 ${PLIST.ocaml-opt}lib/ocaml/stdlib.a
 lib/ocaml/stdlib.cma
 lib/ocaml/stdlib.cmi
@@ -1705,334 +1689,225 @@ ${PLIST.ocaml-opt}lib/ocaml/stdlib.cmx
 ${PLIST.ocaml-opt}lib/ocaml/stdlib.cmxa
 lib/ocaml/stdlib.ml
 lib/ocaml/stdlib.mli
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.a
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.cmx
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib.p.cmxa
+lib/ocaml/stdlib__atomic.cmi
+lib/ocaml/stdlib__atomic.cmt
+lib/ocaml/stdlib__atomic.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__atomic.cmx
 lib/ocaml/stdlib__arg.cmi
 lib/ocaml/stdlib__arg.cmt
 lib/ocaml/stdlib__arg.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__arg.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__arg.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__arg.p.cmx
 lib/ocaml/stdlib__array.cmi
 lib/ocaml/stdlib__array.cmt
 lib/ocaml/stdlib__array.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__array.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__array.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__array.p.cmx
 lib/ocaml/stdlib__arrayLabels.cmi
 lib/ocaml/stdlib__arrayLabels.cmt
 lib/ocaml/stdlib__arrayLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__arrayLabels.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__arrayLabels.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__arrayLabels.p.cmx
 lib/ocaml/stdlib__bigarray.cmi
 lib/ocaml/stdlib__bigarray.cmt
 lib/ocaml/stdlib__bigarray.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__bigarray.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__bigarray.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bigarray.p.cmx
 lib/ocaml/stdlib__bool.cmi
 lib/ocaml/stdlib__bool.cmt
 lib/ocaml/stdlib__bool.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__bool.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__bool.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bool.p.cmx
 lib/ocaml/stdlib__buffer.cmi
 lib/ocaml/stdlib__buffer.cmt
 lib/ocaml/stdlib__buffer.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__buffer.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__buffer.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__buffer.p.cmx
 lib/ocaml/stdlib__bytes.cmi
 lib/ocaml/stdlib__bytes.cmt
 lib/ocaml/stdlib__bytes.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__bytes.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__bytes.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bytes.p.cmx
 lib/ocaml/stdlib__bytesLabels.cmi
 lib/ocaml/stdlib__bytesLabels.cmt
 lib/ocaml/stdlib__bytesLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__bytesLabels.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__bytesLabels.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__bytesLabels.p.cmx
 lib/ocaml/stdlib__callback.cmi
 lib/ocaml/stdlib__callback.cmt
 lib/ocaml/stdlib__callback.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__callback.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__callback.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__callback.p.cmx
 lib/ocaml/stdlib__char.cmi
 lib/ocaml/stdlib__char.cmt
 lib/ocaml/stdlib__char.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__char.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__char.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__char.p.cmx
 lib/ocaml/stdlib__complex.cmi
 lib/ocaml/stdlib__complex.cmt
 lib/ocaml/stdlib__complex.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__complex.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__complex.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__complex.p.cmx
 lib/ocaml/stdlib__digest.cmi
 lib/ocaml/stdlib__digest.cmt
 lib/ocaml/stdlib__digest.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__digest.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__digest.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__digest.p.cmx
+lib/ocaml/stdlib__either.cmi
+lib/ocaml/stdlib__either.cmt
+lib/ocaml/stdlib__either.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__either.cmx
 lib/ocaml/stdlib__ephemeron.cmi
 lib/ocaml/stdlib__ephemeron.cmt
 lib/ocaml/stdlib__ephemeron.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__ephemeron.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__ephemeron.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__ephemeron.p.cmx
 lib/ocaml/stdlib__filename.cmi
 lib/ocaml/stdlib__filename.cmt
 lib/ocaml/stdlib__filename.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__filename.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__filename.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__filename.p.cmx
 lib/ocaml/stdlib__float.cmi
 lib/ocaml/stdlib__float.cmt
 lib/ocaml/stdlib__float.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__float.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__float.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__float.p.cmx
 lib/ocaml/stdlib__format.cmi
 lib/ocaml/stdlib__format.cmt
 lib/ocaml/stdlib__format.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__format.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__format.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__format.p.cmx
 lib/ocaml/stdlib__fun.cmi
 lib/ocaml/stdlib__fun.cmt
 lib/ocaml/stdlib__fun.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__fun.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__fun.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__fun.p.cmx
 lib/ocaml/stdlib__gc.cmi
 lib/ocaml/stdlib__gc.cmt
 lib/ocaml/stdlib__gc.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__gc.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__gc.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__gc.p.cmx
 lib/ocaml/stdlib__genlex.cmi
 lib/ocaml/stdlib__genlex.cmt
 lib/ocaml/stdlib__genlex.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__genlex.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__genlex.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__genlex.p.cmx
 lib/ocaml/stdlib__hashtbl.cmi
 lib/ocaml/stdlib__hashtbl.cmt
 lib/ocaml/stdlib__hashtbl.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__hashtbl.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__hashtbl.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__hashtbl.p.cmx
 lib/ocaml/stdlib__int.cmi
 lib/ocaml/stdlib__int.cmt
 lib/ocaml/stdlib__int.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__int.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__int.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__int.p.cmx
 lib/ocaml/stdlib__int32.cmi
 lib/ocaml/stdlib__int32.cmt
 lib/ocaml/stdlib__int32.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__int32.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__int32.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__int32.p.cmx
 lib/ocaml/stdlib__int64.cmi
 lib/ocaml/stdlib__int64.cmt
 lib/ocaml/stdlib__int64.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__int64.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__int64.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__int64.p.cmx
 lib/ocaml/stdlib__lazy.cmi
 lib/ocaml/stdlib__lazy.cmt
 lib/ocaml/stdlib__lazy.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__lazy.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__lazy.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__lazy.p.cmx
 lib/ocaml/stdlib__lexing.cmi
 lib/ocaml/stdlib__lexing.cmt
 lib/ocaml/stdlib__lexing.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__lexing.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__lexing.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__lexing.p.cmx
 lib/ocaml/stdlib__list.cmi
 lib/ocaml/stdlib__list.cmt
 lib/ocaml/stdlib__list.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__list.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__list.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__list.p.cmx
 lib/ocaml/stdlib__listLabels.cmi
 lib/ocaml/stdlib__listLabels.cmt
 lib/ocaml/stdlib__listLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__listLabels.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__listLabels.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__listLabels.p.cmx
 lib/ocaml/stdlib__map.cmi
 lib/ocaml/stdlib__map.cmt
 lib/ocaml/stdlib__map.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__map.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__map.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__map.p.cmx
 lib/ocaml/stdlib__marshal.cmi
 lib/ocaml/stdlib__marshal.cmt
 lib/ocaml/stdlib__marshal.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__marshal.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__marshal.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__marshal.p.cmx
 lib/ocaml/stdlib__moreLabels.cmi
 lib/ocaml/stdlib__moreLabels.cmt
 lib/ocaml/stdlib__moreLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__moreLabels.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__moreLabels.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__moreLabels.p.cmx
 lib/ocaml/stdlib__nativeint.cmi
 lib/ocaml/stdlib__nativeint.cmt
 lib/ocaml/stdlib__nativeint.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__nativeint.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__nativeint.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__nativeint.p.cmx
 lib/ocaml/stdlib__obj.cmi
 lib/ocaml/stdlib__obj.cmt
 lib/ocaml/stdlib__obj.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__obj.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__obj.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__obj.p.cmx
 lib/ocaml/stdlib__oo.cmi
 lib/ocaml/stdlib__oo.cmt
 lib/ocaml/stdlib__oo.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__oo.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__oo.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__oo.p.cmx
 lib/ocaml/stdlib__option.cmi
 lib/ocaml/stdlib__option.cmt
 lib/ocaml/stdlib__option.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__option.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__option.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__option.p.cmx
 lib/ocaml/stdlib__parsing.cmi
 lib/ocaml/stdlib__parsing.cmt
 lib/ocaml/stdlib__parsing.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__parsing.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__parsing.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__parsing.p.cmx
 lib/ocaml/stdlib__pervasives.cmi
 lib/ocaml/stdlib__pervasives.cmt
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__pervasives.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__pervasives.p.cmi
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__pervasives.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__pervasives.p.cmx
 lib/ocaml/stdlib__printexc.cmi
 lib/ocaml/stdlib__printexc.cmt
 lib/ocaml/stdlib__printexc.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__printexc.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__printexc.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__printexc.p.cmx
 lib/ocaml/stdlib__printf.cmi
 lib/ocaml/stdlib__printf.cmt
 lib/ocaml/stdlib__printf.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__printf.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__printf.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__printf.p.cmx
 lib/ocaml/stdlib__queue.cmi
 lib/ocaml/stdlib__queue.cmt
 lib/ocaml/stdlib__queue.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__queue.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__queue.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__queue.p.cmx
 lib/ocaml/stdlib__random.cmi
 lib/ocaml/stdlib__random.cmt
 lib/ocaml/stdlib__random.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__random.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__random.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__random.p.cmx
 lib/ocaml/stdlib__result.cmi
 lib/ocaml/stdlib__result.cmt
 lib/ocaml/stdlib__result.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__result.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__result.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__result.p.cmx
 lib/ocaml/stdlib__scanf.cmi
 lib/ocaml/stdlib__scanf.cmt
 lib/ocaml/stdlib__scanf.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__scanf.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__scanf.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__scanf.p.cmx
 lib/ocaml/stdlib__seq.cmi
 lib/ocaml/stdlib__seq.cmt
 lib/ocaml/stdlib__seq.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__seq.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__seq.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__seq.p.cmx
 lib/ocaml/stdlib__set.cmi
 lib/ocaml/stdlib__set.cmt
 lib/ocaml/stdlib__set.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__set.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__set.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__set.p.cmx
-lib/ocaml/stdlib__spacetime.cmi
-lib/ocaml/stdlib__spacetime.cmt
-lib/ocaml/stdlib__spacetime.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__spacetime.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__spacetime.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__spacetime.p.cmx
 lib/ocaml/stdlib__stack.cmi
 lib/ocaml/stdlib__stack.cmt
 lib/ocaml/stdlib__stack.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__stack.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__stack.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stack.p.cmx
 lib/ocaml/stdlib__stdLabels.cmi
 lib/ocaml/stdlib__stdLabels.cmt
 lib/ocaml/stdlib__stdLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__stdLabels.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__stdLabels.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stdLabels.p.cmx
 lib/ocaml/stdlib__stream.cmi
 lib/ocaml/stdlib__stream.cmt
 lib/ocaml/stdlib__stream.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__stream.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__stream.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stream.p.cmx
 lib/ocaml/stdlib__string.cmi
 lib/ocaml/stdlib__string.cmt
 lib/ocaml/stdlib__string.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__string.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__string.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__string.p.cmx
 lib/ocaml/stdlib__stringLabels.cmi
 lib/ocaml/stdlib__stringLabels.cmt
 lib/ocaml/stdlib__stringLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__stringLabels.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__stringLabels.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__stringLabels.p.cmx
 lib/ocaml/stdlib__sys.cmi
 lib/ocaml/stdlib__sys.cmt
 lib/ocaml/stdlib__sys.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__sys.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__sys.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__sys.p.cmx
 lib/ocaml/stdlib__uchar.cmi
 lib/ocaml/stdlib__uchar.cmt
 lib/ocaml/stdlib__uchar.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__uchar.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__uchar.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__uchar.p.cmx
 lib/ocaml/stdlib__unit.cmi
 lib/ocaml/stdlib__unit.cmt
 lib/ocaml/stdlib__unit.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__unit.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__unit.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__unit.p.cmx
 lib/ocaml/stdlib__weak.cmi
 lib/ocaml/stdlib__weak.cmt
 lib/ocaml/stdlib__weak.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__weak.cmx
-@comment 4.09 ${PLIST.ocaml-prof}lib/ocaml/stdlib__weak.p.cmt
-@comment 4.09 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/stdlib__weak.p.cmx
 ${PLIST.ocaml-opt}lib/ocaml/str.a
 lib/ocaml/str.cma
 lib/ocaml/str.cmi
@@ -2048,10 +1923,8 @@ lib/ocaml/string.mli
 lib/ocaml/stringLabels.ml
 lib/ocaml/stringLabels.mli
 lib/ocaml/stublibs/dllcamlstr.so
-${PLIST.ocaml-spacetime}lib/ocaml/stublibs/dllraw_spacetime_lib.so
 lib/ocaml/stublibs/dllthreads.so
 lib/ocaml/stublibs/dllunix.so
-@comment 4.09 lib/ocaml/stublibs/dllvmthreads.so
 lib/ocaml/sys.ml
 lib/ocaml/sys.mli
 lib/ocaml/threads/condition.cmi
@@ -2066,6 +1939,10 @@ lib/ocaml/threads/mutex.cmi
 lib/ocaml/threads/mutex.cmti
 ${PLIST.ocaml-opt}lib/ocaml/threads/mutex.cmx
 lib/ocaml/threads/mutex.mli
+lib/ocaml/threads/semaphore.cmi
+lib/ocaml/threads/semaphore.cmti
+${PLIST.ocaml-opt}lib/ocaml/threads/semaphore.cmx
+lib/ocaml/threads/semaphore.mli
 lib/ocaml/threads/thread.cmi
 lib/ocaml/threads/thread.cmti
 ${PLIST.ocaml-opt}lib/ocaml/threads/thread.cmx
@@ -2152,6 +2029,7 @@ man/man3/Ast_invariants.3
 man/man3/Ast_iterator.3
 man/man3/Ast_mapper.3
 man/man3/Asttypes.3
+man/man3/Atomic.3
 man/man3/Attr_helper.3
 man/man3/Bigarray.3
 man/man3/Bigarray.Array0.3
@@ -2159,6 +2037,7 @@ man/man3/Bigarray.Array1.3
 man/man3/Bigarray.Array2.3
 man/man3/Bigarray.Array3.3
 man/man3/Bigarray.Genarray.3
+man/man3/Binutils.3
 man/man3/Bool.3
 man/man3/Buffer.3
 man/man3/Build_path_prefix_map.3
@@ -2166,6 +2045,7 @@ man/man3/Builtin_attributes.3
 man/man3/Bytes.3
 man/man3/BytesLabels.3
 man/man3/Callback.3
+man/man3/CamlinternalAtomic.3
 man/man3/CamlinternalFormat.3
 man/man3/CamlinternalFormatBasics.3
 man/man3/CamlinternalLazy.3
@@ -2224,6 +2104,7 @@ man/man3/Docstrings.3
 man/man3/Docstrings.WithMenhir.3
 man/man3/Domainstate.3
 man/man3/Dynlink.3
+man/man3/Either.3
 man/man3/Ephemeron.3
 man/man3/Ephemeron.GenHashTable.3
 man/man3/Ephemeron.GenHashTable.MakeSeeded.3
@@ -2281,6 +2162,7 @@ man/man3/List.3
 man/man3/ListLabels.3
 man/man3/Load_path.3
 man/man3/Load_path.Dir.3
+man/man3/Local_store.3
 man/man3/Location.3
 man/man3/Longident.3
 man/man3/Map.3
@@ -2327,6 +2209,7 @@ man/man3/Numbers.Int.3
 man/man3/Numbers.Int16.3
 man/man3/Numbers.Int8.3
 man/man3/Obj.3
+man/man3/Obj.Closure.3
 man/man3/Obj.Ephemeron.3
 man/man3/Obj.Extension_constructor.3
 man/man3/Ocaml_operators.3
@@ -2351,14 +2234,14 @@ man/man3/Random.State.3
 man/man3/Result.3
 man/man3/Scanf.3
 man/man3/Scanf.Scanning.3
+man/man3/Semaphore.3
+man/man3/Semaphore.Binary.3
+man/man3/Semaphore.Counting.3
 man/man3/Seq.3
 man/man3/Set.3
 man/man3/Set.Make.3
 man/man3/Set.OrderedType.3
 man/man3/Set.S.3
-man/man3/Spacetime.3
-man/man3/Spacetime.Series.3
-man/man3/Spacetime.Snapshot.3
 man/man3/Stack.3
 man/man3/StdLabels.3
 man/man3/StdLabels.Array.3
@@ -2369,6 +2252,7 @@ man/man3/Stdlib.3
 man/man3/Stdlib.Arg.3
 man/man3/Stdlib.Array.3
 man/man3/Stdlib.ArrayLabels.3
+man/man3/Stdlib.Atomic.3
 man/man3/Stdlib.Bigarray.3
 man/man3/Stdlib.Bool.3
 man/man3/Stdlib.Buffer.3
@@ -2378,6 +2262,7 @@ man/man3/Stdlib.Callback.3
 man/man3/Stdlib.Char.3
 man/man3/Stdlib.Complex.3
 man/man3/Stdlib.Digest.3
+man/man3/Stdlib.Either.3
 man/man3/Stdlib.Ephemeron.3
 man/man3/Stdlib.Filename.3
 man/man3/Stdlib.Float.3
@@ -2411,7 +2296,6 @@ man/man3/Stdlib.Result.3
 man/man3/Stdlib.Scanf.3
 man/man3/Stdlib.Seq.3
 man/man3/Stdlib.Set.3
-man/man3/Stdlib.Spacetime.3
 man/man3/Stdlib.Stack.3
 man/man3/Stdlib.StdLabels.3
 man/man3/Stdlib.Stream.3
diff --git a/ocaml/buildlink3.mk b/ocaml/buildlink3.mk
index 28e924beee..9b002a7553 100644
--- a/ocaml/buildlink3.mk
+++ b/ocaml/buildlink3.mk
@@ -1,13 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.49 2019/01/07 18:52:23 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.56 2021/03/08 08:08:43 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml
 
 .if !defined(OCAML_BUILDLINK3_MK)
 OCAML_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=4.11.1
-BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=4.11.1
-BUILDLINK_PKGSRCDIR.ocaml?=	../../wip/ocaml
+BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=4.12.0
+BUILDLINK_ABI_DEPENDS.ocaml+=	ocaml>=4.12.0
+BUILDLINK_PKGSRCDIR.ocaml?=	../../lang/ocaml
 #BUILDLINK_DEPMETHOD.ocaml?=	build
 
 BUILDLINK_PASSTHRU_DIRS+=	${BUILDLINK_PREFIX.ocaml}/lib/ocaml
diff --git a/ocaml/distinfo b/ocaml/distinfo
index c1d71c5fef..922ed25014 100644
--- a/ocaml/distinfo
+++ b/ocaml/distinfo
@@ -1,23 +1,21 @@
-$NetBSD: distinfo,v 1.125 2019/01/07 18:52:23 jaapb Exp $
+$NetBSD: distinfo,v 1.142 2021/03/08 08:08:43 jaapb Exp $
 
-SHA1 (ocaml-4.11.1.tar.gz) = a3f3d74a43a3d0054f0d0162522499f7d8958560
-RMD160 (ocaml-4.11.1.tar.gz) = 6bdd83aeab8a074cfeffa475fe2db72cbca2d6cf
-SHA512 (ocaml-4.11.1.tar.gz) = 7adc40ab1c4086861619ce7280c75d0d200c398f8a7c2c89b0569a34b4deac8c6857b645340a525f656523cb92c4f73c1329e757b6ed41ea080e9cd540e6cb7b
-Size (ocaml-4.11.1.tar.gz) = 5062453 bytes
-SHA1 (patch-Makefile) = bd0451b5240b087c98747d13f9884d30722a91a8
-SHA1 (patch-Makefile.common.in) = 37d880f7125040fd4a125ff0e24615811ce9c827
-SHA1 (patch-asmcomp_amd64_emit.mlp) = c2b90f50bc3c4bf9817916bdd455a8bfc03cb69b
+SHA1 (ocaml-4.12.0.tar.gz) = 6aee5658204c68042fbc8ef993c28475998a97f6
+RMD160 (ocaml-4.12.0.tar.gz) = 92711b958b528fff842313deef68596dce2f02b5
+SHA512 (ocaml-4.12.0.tar.gz) = 7c9e4ebe9c6e3f04eca9b837b70f3dcfda7d81d033f4fb6d0c507cd40c82115c0dde0907444f60c406a301fafe1a48d0bca01ee6af192fd08458d3b1bee7f717
+Size (ocaml-4.12.0.tar.gz) = 5075034 bytes
+SHA1 (patch-Makefile) = 8bf66264a8c4c28884a171eb19ed7ea8d8af8051
+SHA1 (patch-Makefile.build_config.in) = 18703cddafff3d0f2f2ee12cbb2cd1600d755d6e
 SHA1 (patch-check-linker-version_sh) = c90242556207242ac58499d7f42519a10aedcca4
-SHA1 (patch-configure) = 5791eba70a6d06fe79f6268a3d4e40a1dc636fd1
-SHA1 (patch-lex_Makefile) = 7f1ad4d5852a9a38b9c33ca33728236cc457fa09
+SHA1 (patch-configure) = 32b499d2acbd3075762fa578be1cad74bbcd2817
+SHA1 (patch-lex_Makefile) = b549f0913f4ee1d86df977c2a3bb7d8f887915d4
 SHA1 (patch-man_Makefile) = b780c026aef5f7e6b22b142fce3ec87ef9d2ab22
 SHA1 (patch-ocamldoc_Makefile) = 0a3c536d1cd9f811a1ef1d7155036b8ddbcf4f4f
 SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b
-SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 05f14ad2635bfd2ded98ef38ac6e7578b5cfc08e
+SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 6ad7b42f06ef86e4a88440bfd16e1ff0fc4b3556
 SHA1 (patch-otherlibs_systhreads_Makefile) = ff2cf90527bda37474097bb576bccbf7329c4f1d
 SHA1 (patch-otherlibs_systhreads_st__stubs.c) = 3c0aa73f0e128646c01ed3855ee9c5645d5fa3f1
 SHA1 (patch-runtime_Makefile) = 6c70b68791e4c074179aa27dfafb398646b59dcb
-SHA1 (patch-runtime_amd64.S) = d4c33cb14c107ed03bf6a3704bbfe7c2799a048e
 SHA1 (patch-testsuite_tests_lib-systhreads_testyield.ml) = 0f6d35e030de168c6f4aeb126055065ed47878aa
 SHA1 (patch-tools_Makefile) = 69f92a8615ed6f9b33f27546c6a25a1f24995e55
 SHA1 (patch-tools_ocamlmklib.ml) = 9a9c0e3b473f7ba4127fe120cf6dbbdbb3c957f2
diff --git a/ocaml/files/wrapper.sh b/ocaml/files/wrapper.sh
index e5fe8214fb..50f78d8cc5 100644
--- a/ocaml/files/wrapper.sh
+++ b/ocaml/files/wrapper.sh
@@ -1,25 +1,29 @@
 #!@SH@
+#
+# $NetBSD: wrapper.sh,v 1.5 2021/01/12 11:19:17 jperkin Exp $
 
-# $NetBSD: wrapper.sh,v 1.3 2016/02/29 13:51:28 jperkin Exp $
-
-BINDIR='@OCAML_PREFIX@'
 CFLAGS='@CFLAGS@'
 LDFLAGS='@LDFLAGS@'
 WRAPPEE='@WRAPPEE@'
 
-if echo "$@" | grep ' -c ' >/dev/null || [ "${WRAPPEE}" = "ocamlmklib" ]; then
-	flags="${CFLAGS}"
-else
-	flags="${CFLAGS} ${LDFLAGS}"
-fi
-
-for f in ${flags}
-do
-	MLFLAGS="${MLFLAGS} -ccopt ${f}"
+for flag in ${CFLAGS}; do
+	cflags="${cflags} -ccopt ${flag}"
+done
+for flag in ${LDFLAGS}; do
+	cldflags="${cldflags} -ccopt ${flag}"
+	ldflags="${ldflags} -ldopt ${flag}"
 done
 
-if [ "${WRAPPEE}" = "ocamlmklib" ]; then
-	MLFLAGS="${MLFLAGS} ${LDFLAGS}"
-fi
+case "${WRAPPEE} $@" in
+ocamlmklib*)
+	MLFLAGS="${cflags} ${ldflags}"
+	;;
+*" -c "*)
+	MLFLAGS="${cflags}"
+	;;
+*)
+	MLFLAGS="${cflags} ${cldflags}"
+	;;
+esac
 
 exec "@OCAML_PREFIX@/bin/${WRAPPEE}" ${MLFLAGS} "$@"
diff --git a/ocaml/hacks.mk b/ocaml/hacks.mk
index 93a66b79b2..6c7afc3b60 100644
--- a/ocaml/hacks.mk
+++ b/ocaml/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.6 2014/12/15 11:46:35 jperkin Exp $
+# $NetBSD: hacks.mk,v 1.9 2020/12/09 10:33:04 jaapb Exp $
 
 .if !defined(OCAML_HACKS_MK)
 OCAML_HACKS_MK=	defined
diff --git a/ocaml/options.mk b/ocaml/options.mk
index 81a3abf43e..afb2af2077 100644
--- a/ocaml/options.mk
+++ b/ocaml/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2017/09/08 09:12:44 jaapb Exp $
+# $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 spacetime
diff --git a/ocaml/patches/patch-Makefile b/ocaml/patches/patch-Makefile
index 469490273f..f885f4e89f 100644
--- a/ocaml/patches/patch-Makefile
+++ b/ocaml/patches/patch-Makefile
@@ -1,11 +1,8 @@
 $NetBSD$
 
-Use BSD_INSTALL_* instead of mkdir
-Honor LDFLAGS
-
---- Makefile.orig	2020-09-01 12:47:58.000000000 +0000
+--- Makefile.orig	2021-02-24 13:49:29.000000000 +0000
 +++ Makefile
-@@ -61,7 +61,7 @@ INCLUDES=-I utils -I parsing -I typing -
+@@ -45,7 +45,7 @@ INCLUDES=-I utils -I parsing -I typing -
  COMPFLAGS=-strict-sequence -principal -absname -w +a-4-9-40-41-42-44-45-48-66 \
  	  -warn-error A \
            -bin-annot -safe-string -strict-formats $(INCLUDES)
@@ -14,7 +11,15 @@ Honor LDFLAGS
  
  ifeq "$(strip $(NATDYNLINKOPTS))" ""
  OCAML_NATDYNLINKOPTS=
-@@ -351,10 +351,10 @@ endif
+@@ -341,17 +341,17 @@ ifneq "$(filter-out mingw,$(TOOLCHAIN))"
+     "$(INSTALL_BINDIR)/"
+ endif
+ 	if test -n "$(wildcard flexdll/flexdll_*.$(O))" ; then \
+-	  $(MKDIR) "$(INSTALL_FLEXDLLDIR)" ; \
++	  $(BSD_INSTALL_LIB_DIR) "$(INSTALL_FLEXDLLDIR)" ; \
+ 	  $(INSTALL_DATA) flexdll/flexdll_*.$(O) "$(INSTALL_FLEXDLLDIR)" ; \
+ 	fi
+ 
  # Installation
  .PHONY: install
  install:
@@ -26,10 +31,10 @@ Honor LDFLAGS
 +	$(BSD_INSTALL_LIB_DIR) "$(INSTALL_LIBDIR)"
 +	$(BSD_INSTALL_LIB_DIR) "$(INSTALL_STUBLIBDIR)"
 +	$(BSD_INSTALL_LIB_DIR) "$(INSTALL_COMPLIBDIR)"
- 	$(INSTALL_DATA) \
- 	  VERSION \
- 	  "$(INSTALL_LIBDIR)"
-@@ -408,7 +408,7 @@ ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true
+ 	$(MAKE) -C runtime install
+ 	$(INSTALL_PROG) ocaml$(EXE) "$(INSTALL_BINDIR)"
+ ifeq "$(INSTALL_BYTECODE_PROGRAMS)" "true"
+@@ -403,7 +403,7 @@ ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true
  endif
  	$(MAKE) -C tools install
  ifeq "$(UNIX_OR_WIN32)" "unix" # Install manual pages only on Unix
diff --git a/ocaml/patches/patch-Makefile.build_config.in b/ocaml/patches/patch-Makefile.build_config.in
new file mode 100644
index 0000000000..dbd464069c
--- /dev/null
+++ b/ocaml/patches/patch-Makefile.build_config.in
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- Makefile.build_config.in.orig	2021-02-24 13:49:29.000000000 +0000
++++ Makefile.build_config.in
+@@ -20,9 +20,9 @@
+ # $(ROOTDIR) has been defined.
+ 
+ include $(ROOTDIR)/Makefile.config
+-INSTALL ?= @INSTALL@
+-INSTALL_DATA ?= @INSTALL_DATA@
+-INSTALL_PROG ?= @INSTALL_PROGRAM@
++INSTALL ?= $(BSD_INSTALL)
++INSTALL_DATA ?= $(BSD_INSTALL_DATA)
++INSTALL_PROG ?= $(BSD_INSTALL_SCRIPT)
+ 
+ # The command to generate C dependency information
+ DEP_CC=@DEP_CC@ -MM
diff --git a/ocaml/patches/patch-Makefile.common.in b/ocaml/patches/patch-Makefile.common.in
deleted file mode 100644
index 7668c52366..0000000000
--- a/ocaml/patches/patch-Makefile.common.in
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-Use BSD_INSTALL_*
-
---- Makefile.common.in.orig	2020-01-10 16:10:46.000000000 +0000
-+++ Makefile.common.in
-@@ -19,9 +19,9 @@
- # other Makefiles
- # We assume that Makefile.config has already been included
- 
--INSTALL ?= @INSTALL@
--INSTALL_DATA ?= $(INSTALL) -m u=rw,g=rw,o=r
--INSTALL_PROG ?= $(INSTALL) -m u=rwx,g=rwx,o=rx
-+INSTALL ?= $(BSD_INSTALL)
-+INSTALL_DATA ?= $(BSD_INSTALL_DATA)
-+INSTALL_PROG ?= $(BSD_INSTALL_SCRIPT)
- 
- # note: these are defined by lazy expansions
- # as some parts of the makefiles change BINDIR, etc.
diff --git a/ocaml/patches/patch-asmcomp_amd64_emit.mlp b/ocaml/patches/patch-asmcomp_amd64_emit.mlp
deleted file mode 100644
index 29658b5157..0000000000
--- a/ocaml/patches/patch-asmcomp_amd64_emit.mlp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-asmcomp_amd64_emit.mlp,v 1.3 2018/07/18 00:09:12 joerg Exp $
-
-Fix attributes and entry size or the .rodata mergable constant section
-
---- asmcomp/amd64/emit.mlp.orig	2018-07-17 21:17:05.536787953 +0000
-+++ asmcomp/amd64/emit.mlp
-@@ -986,7 +986,7 @@ let begin_assembly() =
-     | S_macosx -> D.section ["__TEXT";"__literal16"] None ["16byte_literals"]
-     | S_mingw64 | S_cygwin -> D.section [".rdata"] (Some "dr") []
-     | S_win64 -> D.data ()
--    | _ -> D.section [".rodata.cst8"] (Some "a") ["@progbits"]
-+    | _ -> D.section [".rodata.cst8"] (Some "aM") ["@progbits,8"]
-     end;
-     D.align 16;
-     _label (emit_symbol "caml_negf_mask");
-@@ -1046,7 +1046,7 @@ let end_assembly() =
-     | S_macosx -> D.section ["__TEXT";"__literal8"] None ["8byte_literals"]
-     | S_mingw64 | S_cygwin -> D.section [".rdata"] (Some "dr") []
-     | S_win64 -> D.data ()
--    | _ -> D.section [".rodata.cst8"] (Some "a") ["@progbits"]
-+    | _ -> D.section [".rodata.cst8"] (Some "aM") ["@progbits,8"]
-     end;
-     List.iter (fun (cst,lbl) -> emit_float_constant cst lbl) !float_constants
-   end;
diff --git a/ocaml/patches/patch-configure b/ocaml/patches/patch-configure
index 6efe9de8ed..c29de6cbe0 100644
--- a/ocaml/patches/patch-configure
+++ b/ocaml/patches/patch-configure
@@ -1,15 +1,8 @@
 $NetBSD$
 
-All kinds of OS-specific changes to configure
-Honor LDFLAGS.
-
-Add SunOS -lnsl -lsocket
-Recognise SunOS/amd64 as amd64
-Recognise SunOS as having shared libraries
-
---- configure.orig	2020-09-01 12:47:58.000000000 +0000
+--- configure.orig	2021-02-24 13:49:29.000000000 +0000
 +++ configure
-@@ -13476,7 +13476,7 @@ sharedlib_cflags=''
+@@ -13639,7 +13639,7 @@ sharedlib_cflags=''
  mksharedlib='shared-libs-not-available'
  rpath=''
  mksharedlibrpath=''
@@ -18,7 +11,7 @@ Recognise SunOS as having shared libraries
  
  if test x"$enable_shared" != "xno"; then :
    case $host in #(
-@@ -13513,6 +13513,12 @@ esac ;; #(
+@@ -13692,6 +13692,12 @@ esac
        mksharedlibrpath="-Wl,-rpath,"
        natdynlinkopts="-Wl,-E"
        shared_libraries_supported=true ;; #(
@@ -31,7 +24,7 @@ Recognise SunOS as having shared libraries
    *) :
       ;;
  esac
-@@ -13534,6 +13540,8 @@ if test x"$enable_shared" != "xno"; then
+@@ -13713,6 +13719,8 @@ if test x"$enable_shared" != "xno"; then
      natdynlink=true ;; #(
    *-pc-windows) :
      natdynlink=true ;; #(
@@ -40,7 +33,7 @@ Recognise SunOS as having shared libraries
    i[3456]86-*-linux*) :
      natdynlink=true ;; #(
    i[3456]86-*-gnu*) :
-@@ -13562,6 +13570,8 @@ if test x"$enable_shared" != "xno"; then
+@@ -13747,6 +13755,8 @@ if test x"$enable_shared" != "xno"; then
      natdynlink=true ;; #(
    i[3456]86-*-netbsd*) :
      natdynlink=true ;; #(
@@ -49,7 +42,7 @@ Recognise SunOS as having shared libraries
    x86_64-*-netbsd*) :
      natdynlink=true ;; #(
    i386-*-gnu0.3) :
-@@ -13572,12 +13582,16 @@ if test x"$enable_shared" != "xno"; then
+@@ -13757,12 +13767,16 @@ if test x"$enable_shared" != "xno"; then
      natdynlink=true ;; #(
    arm*-*-freebsd*) :
      natdynlink=true ;; #(
@@ -66,7 +59,7 @@ Recognise SunOS as having shared libraries
    riscv*-*-linux*) :
      natdynlink=true ;; #(
    *) :
-@@ -13649,6 +13663,8 @@ case $host in #(
+@@ -13860,6 +13874,8 @@ case $host in #(
      arch=i386; system=beos ;; #(
    i[3456]86-*-cygwin) :
      arch=i386; system=cygwin ;; #(
@@ -75,7 +68,7 @@ Recognise SunOS as having shared libraries
    i[3456]86-*-gnu*) :
      arch=i386; system=gnu ;; #(
    i[3456]86-*-mingw32) :
-@@ -13665,6 +13681,8 @@ case $host in #(
+@@ -13876,6 +13892,8 @@ case $host in #(
  else
    model=ppc
  fi; system=elf ;; #(
@@ -84,7 +77,7 @@ Recognise SunOS as having shared libraries
    s390x*-*-linux*) :
      arch=s390x; model=z10; system=elf ;; #(
    armv6*-*-linux-gnueabihf) :
-@@ -13683,6 +13701,10 @@ fi; system=elf ;; #(
+@@ -13894,6 +13912,10 @@ fi; system=elf ;; #(
      arch=arm; model=armv6; system=linux_eabi ;; #(
    armv6*-*-freebsd*) :
      arch=arm; model=armv6; system=freebsd ;; #(
@@ -95,7 +88,7 @@ Recognise SunOS as having shared libraries
    earmv6*-*-netbsd*) :
      arch=arm; model=armv6; system=netbsd ;; #(
    earmv7*-*-netbsd*) :
-@@ -13719,8 +13741,12 @@ fi; system=elf ;; #(
+@@ -13936,8 +13958,12 @@ fi; system=elf ;; #(
      arch=arm64; system=linux ;; #(
    aarch64-*-freebsd*) :
      arch=arm64; system=freebsd ;; #(
@@ -108,16 +101,7 @@ Recognise SunOS as having shared libraries
    riscv64-*-linux*) :
      arch=riscv; model=riscv64; system=linux
   ;; #(
-@@ -13851,8 +13877,6 @@ if test -z "$PARTIALLD"; then :
-   case "$arch,$CC,$system,$model" in #(
-   amd64,gcc*,macosx,*) :
-     PACKLD='ld -r -arch x86_64 -o $(EMPTY)' ;; #(
--  amd64,gcc*,solaris,*) :
--    PACKLD='ld -r -m elf_x86_64 -o $(EMPTY)' ;; #(
-   power,gcc*,elf,ppc) :
-     PACKLD='ld -r -m elf32ppclinux -o $(EMPTY)' ;; #(
-   power,gcc*,elf,ppc64) :
-@@ -13947,6 +13971,9 @@ esac ;; #(
+@@ -14268,6 +14294,9 @@ esac ;; #(
    *) :
       ;;
  esac ;; #(
@@ -127,7 +111,7 @@ Recognise SunOS as having shared libraries
    s390x,elf) :
      default_as="${toolpref}as -m 64 -march=$model"
      default_aspp="${toolpref}gcc -c -Wa,-march=$model" ;; #(
-@@ -14028,7 +14055,7 @@ fi
+@@ -14396,7 +14425,7 @@ fi
  # for the moment, to be backward-compatible
  
  case $host in #(
@@ -136,7 +120,7 @@ Recognise SunOS as having shared libraries
       ;; #(
    *) :
      has_c99_float_ops=true
-@@ -14317,6 +14344,9 @@ case $host in #(
+@@ -14687,6 +14716,9 @@ case $host in #(
    *-*-mingw32|*-pc-windows) :
      cclibs="$cclibs -lws2_32"
      sockets=true ;; #(
diff --git a/ocaml/patches/patch-lex_Makefile b/ocaml/patches/patch-lex_Makefile
index 7774cdc622..aa19ba2744 100644
--- a/ocaml/patches/patch-lex_Makefile
+++ b/ocaml/patches/patch-lex_Makefile
@@ -1,24 +1,22 @@
 $NetBSD$
 
-Honor LDFLAGS.
-
---- lex/Makefile.orig	2020-01-10 16:10:46.000000000 +0000
+--- lex/Makefile.orig	2021-02-24 13:49:29.000000000 +0000
 +++ lex/Makefile
-@@ -27,7 +27,7 @@ CAMLC = $(BOOT_OCAMLC) -strict-sequence 
- CAMLOPT = $(CAMLRUN) $(ROOTDIR)/ocamlopt -nostdlib -I $(ROOTDIR)/stdlib
+@@ -26,7 +26,7 @@ CAMLC = $(BOOT_OCAMLC) -strict-sequence 
+ CAMLOPT = $(CAMLRUN) $(ROOTDIR)/ocamlopt$(EXE) -nostdlib -I $(ROOTDIR)/stdlib
  COMPFLAGS = -absname -w +a-4-9-41-42-44-45-48 -warn-error A \
              -safe-string -strict-sequence -strict-formats -bin-annot
 -LINKFLAGS =
 +LINKFLAGS = -cclib "$(LDFLAGS)"
- YACCFLAGS = -v
  CAMLLEX = $(CAMLRUN) $(ROOTDIR)/boot/ocamllex
  CAMLDEP = $(BOOT_OCAMLC) -depend
-@@ -46,7 +46,7 @@ ocamllex: $(OBJS)
- 	$(CAMLC) $(LINKFLAGS) -compat-32 -o ocamllex $(OBJS)
+ DEPFLAGS = -slash
+@@ -48,7 +48,7 @@ ocamllex$(EXE): $(OBJS)
+ 	$(CAMLC) $(LINKFLAGS) -compat-32 -o $@ $^
  
- ocamllex.opt: $(OBJS:.cmo=.cmx)
--	$(CAMLOPT_CMD) -o ocamllex.opt $(OBJS:.cmo=.cmx)
-+	$(CAMLOPT_CMD) $(LINKFLAGS) -o ocamllex.opt $(OBJS:.cmo=.cmx)
+ ocamllex.opt$(EXE): $(OBJS:.cmo=.cmx)
+-	$(CAMLOPT_CMD) -o $@ $^
++	$(CAMLOPT_CMD) $(LINKFLAGS) -o $@ $^
  
  clean::
- 	rm -f ocamllex ocamllex.opt
+ 	rm -f $(programs) $(programs:=.exe)
diff --git a/ocaml/patches/patch-ocamldoc_Makefile b/ocaml/patches/patch-ocamldoc_Makefile
index 6d6d1cd7fd..5bd4ab9c8d 100644
--- a/ocaml/patches/patch-ocamldoc_Makefile
+++ b/ocaml/patches/patch-ocamldoc_Makefile
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-ocamldoc_Makefile,v 1.9 2020/12/09 10:33:04 jaapb Exp $
 
 Honor LDFLAGS.
 
diff --git a/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common b/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
index f1912f4bb4..ca84d61662 100644
--- a/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
+++ b/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
@@ -1,11 +1,9 @@
 $NetBSD$
 
-Honor LDFLAGS.
-
---- otherlibs/Makefile.otherlibs.common.orig	2020-01-10 16:10:46.000000000 +0000
+--- otherlibs/Makefile.otherlibs.common.orig	2021-02-24 13:49:29.000000000 +0000
 +++ otherlibs/Makefile.otherlibs.common
-@@ -51,7 +51,7 @@ COBJS ?=
- EXTRACFLAGS ?=
+@@ -50,7 +50,7 @@ EXTRACFLAGS ?=
+ EXTRACPPFLAGS ?=
  EXTRACAMLFLAGS ?=
  LINKOPTS ?=
 -LDOPTS ?=
diff --git a/ocaml/patches/patch-otherlibs_systhreads_Makefile b/ocaml/patches/patch-otherlibs_systhreads_Makefile
index 9c5722ee9d..144d7b188b 100644
--- a/ocaml/patches/patch-otherlibs_systhreads_Makefile
+++ b/ocaml/patches/patch-otherlibs_systhreads_Makefile
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-otherlibs_systhreads_Makefile,v 1.12 2020/12/09 10:33:04 jaapb Exp $
 
 Honor LDFLAGS.
 
diff --git a/ocaml/patches/patch-otherlibs_systhreads_st__stubs.c b/ocaml/patches/patch-otherlibs_systhreads_st__stubs.c
index 5d33a00c40..b20da18bc7 100644
--- a/ocaml/patches/patch-otherlibs_systhreads_st__stubs.c
+++ b/ocaml/patches/patch-otherlibs_systhreads_st__stubs.c
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-otherlibs_systhreads_st__stubs.c,v 1.4 2020/12/09 10:33:04 jaapb Exp $
 
 Make the POSIX sigwait visible on SmartOS
 
diff --git a/ocaml/patches/patch-runtime_Makefile b/ocaml/patches/patch-runtime_Makefile
index fb06549afa..c3f092dead 100644
--- a/ocaml/patches/patch-runtime_Makefile
+++ b/ocaml/patches/patch-runtime_Makefile
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-runtime_Makefile,v 1.3 2020/12/09 10:33:04 jaapb Exp $
 
 Honor LDFLAGS.
 
diff --git a/ocaml/patches/patch-runtime_amd64.S b/ocaml/patches/patch-runtime_amd64.S
deleted file mode 100644
index fae198405d..0000000000
--- a/ocaml/patches/patch-runtime_amd64.S
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-asmrun_amd64.S,v 1.1 2018/07/18 00:09:12 joerg Exp $
-
-Fix attributes and entry size for the .rodata mergable constant section
-
---- runtime/amd64.S.orig	2018-07-17 21:24:20.027817665 +0000
-+++ runtime/amd64.S
-@@ -724,7 +724,7 @@ G(caml_system__spacetime_shapes):
- #elif defined(SYS_mingw64) || defined(SYS_cygwin)
-         .section .rdata,"dr"
- #else
--        .section    .rodata.cst8,"a",@progbits
-+        .section    .rodata.cst8,"aM",@progbits,8
- #endif
-         .globl  G(caml_negf_mask)
-         .align  SIXTEEN_ALIGN
diff --git a/ocaml/patches/patch-testsuite_tests_lib-systhreads_testyield.ml b/ocaml/patches/patch-testsuite_tests_lib-systhreads_testyield.ml
index f53fc3ac39..89fb21342f 100644
--- a/ocaml/patches/patch-testsuite_tests_lib-systhreads_testyield.ml
+++ b/ocaml/patches/patch-testsuite_tests_lib-systhreads_testyield.ml
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-testsuite_tests_lib-systhreads_testyield.ml,v 1.2 2020/12/09 10:33:04 jaapb Exp $
 
 On NetBSD, the "thread scheduler" appears to just schedule two
 threads out of 4 when all they in essence to is "yield", and not
diff --git a/ocaml/patches/patch-tools_Makefile b/ocaml/patches/patch-tools_Makefile
index 5b3c8700aa..fe2b63fc92 100644
--- a/ocaml/patches/patch-tools_Makefile
+++ b/ocaml/patches/patch-tools_Makefile
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-tools_Makefile,v 1.3 2020/12/09 10:33:04 jaapb Exp $
 
 Honor LDFLAGS.
 
diff --git a/ocaml/patches/patch-tools_ocamlmklib.ml b/ocaml/patches/patch-tools_ocamlmklib.ml
index fd96442196..9b714f289b 100644
--- a/ocaml/patches/patch-tools_ocamlmklib.ml
+++ b/ocaml/patches/patch-tools_ocamlmklib.ml
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-tools_ocamlmklib.ml,v 1.1 2020/12/09 10:33:04 jaapb Exp $
 
 Add ELF mode support to ocamlmklib
 
diff --git a/ocaml/patches/patch-yacc_Makefile b/ocaml/patches/patch-yacc_Makefile
index 7cd0f908a7..ec0e1c3104 100644
--- a/ocaml/patches/patch-yacc_Makefile
+++ b/ocaml/patches/patch-yacc_Makefile
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-yacc_Makefile,v 1.6 2020/12/09 10:33:04 jaapb Exp $
 
 Honor LDFLAGS when building ocamlyacc.
Prev by Date: Fixed errors in ocaml pointed out by pkglint
Next by Date: added xmlada new
Previous by Thread: Fixed errors in ocaml pointed out by pkglint
Next by Thread: added xmlada new
Indexes:
Home | Main Index | Thread Index | Old Index