Update to upstream version 110.91

PR:		239858
Submitted by:	joemann@beefree.free.de (maintainer)

20 files changed, 179 insertions, 155 deletions

diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile
index dfa3e198553f..bc3397259c91 100644
--- a/lang/smlnj/Makefile
+++ b/lang/smlnj/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	smlnj
-PORTVERSION=	110.84
+PORTVERSION=	110.91
 CATEGORIES=	lang
 MASTER_SITES=	http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ \
 		ftp://mirror.free.de/http/smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/
@@ -27,12 +27,10 @@ SUB_FILES=	pkg-install
 SUB_LIST=	EXEBINDIR=${MLBINRELATIVE} EXENAMES="${MLEXE}"
 PKGDEINSTALL=	${PKGINSTALL}
 
-OPTIONS_DEFINE=		EVERYTHING RECOMPILE POSITION64
+OPTIONS_DEFINE=		EVERYTHING RECOMPILE
 RECOMPILE_IMPLIES=	EVERYTHING
-POSITION64_IMPLIES=	RECOMPILE
 EVERYTHING_DESC=	install everything from the SML/NJ distribution
 RECOMPILE_DESC=		recompile the SML compiler - implies EVERYTHING
-POSITION64_DESC=	use 64bit file positions - implies RECOMPILE
 
 .include <bsd.port.pre.mk>
 
@@ -41,6 +39,7 @@ CFLAGS+=	-m32
 AS?=		as
 ASFLAGS+=	--32
 .endif
+CPPASFLAGS+=	-DGNU_ASSEMBLER
 .if (${ARCH} == "i386" || ${ARCH} == "amd64")
 MLARCH=		x86
 DISTFILES+=	boot.x86-unix.tgz
@@ -51,11 +50,8 @@ DISTFILES+=	MLRISC.tgz asdl.tgz ckit.tgz cml.tgz doc.tgz heap2asm.tgz \
 
 PLIST_SUB+=	MLARCH=${MLARCH}
 
-.if ${PORT_OPTIONS:MPOSITION64}
-CMB_COMMAND=	'(\#set o CMB.symval) "USE_64_BIT_POSITIONS" (SOME 1);'
-.else
+# Useful for tuning recompilation.
 CMB_COMMAND=
-.endif
 
 .if ${PORT_OPTIONS:MEVERYTHING}
 DISTFILES+=	cm.tgz compiler.tgz eXene.tgz \
@@ -82,6 +78,7 @@ MLTARGETS=	heap2asm
 MLEXE=		asdlgen heap2exec ml-antlr ml-build ml-burg ml-lex \
 		ml-makedepend ml-nlffigen ml-ulex ml-yacc sml
 .if ${PORT_OPTIONS:MEVERYTHING}
+MLSTDSRCDIRS+=	eXene pgraph smlnj-c
 MLTARGETS+=	eXene mlrisc-tools nowhere pgraph-util src-smlnj
 MLEXE+=		nowhere
 PLIST=		${WRKDIR}/.PLIST
@@ -102,10 +99,6 @@ pre-fetch:
 	@${ECHO} 'Use port option RECOMPILE to recompile the compiler.'
 	@${ECHO} ' This implies EVERYTHING.'
 .endif
-.if ! ${PORT_OPTIONS:MPOSITION64}
-	@${ECHO} 'Use port option POSITION64 to use 64bit file positions.'
-	@${ECHO} ' This implies RECOMPILE.'
-.endif
 	@${ECHO}
 
 # make symlinks to the dist files
@@ -177,7 +170,8 @@ do-build:
 	MLSTANDARDPATCHDIRS=`${MLSTANDARDPATCHDIRS_CMD}` \
 	MLSOURCEPATCHES=`${MLSOURCEPATCHES_CMD}` \
 	CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' \
-	AS='${AS}' ASFLAGS='${ASFLAGS}' EXTRA_DEFS='${EXTRA_DEFS}' \
+	AS='${AS}' ASFLAGS='${ASFLAGS}' CPPASFLAGS='${CPPASFLAGS}' \
+	EXTRA_DEFS='${EXTRA_DEFS}' \
 	./config/install.sh
 .if ${PORT_OPTIONS:MRECOMPILE}
 	-${RM} ${WRKSRC}/config/targets.customized
@@ -204,7 +198,8 @@ do-build:
 	PATCH_ARGS="-d ${PATCH_WRKSRC} ${PATCH_ARGS}" \
 	MLNORUNTIMECLEAN=yes RECOMPILEDIR="${RECOMPILEDIR}" \
 	CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' \
-	AS='${AS}' ASFLAGS='${ASFLAGS}' EXTRA_DEFS='${EXTRA_DEFS}' \
+	AS='${AS}' ASFLAGS='${ASFLAGS}' CPPASFLAGS='${CPPASFLAGS}' \
+	EXTRA_DEFS='${EXTRA_DEFS}' \
 	./config/install.sh
 .endif
 
@@ -302,7 +297,8 @@ do-install:
 	STAGEDIR="${STAGEDIR}" MLLIB="${MLLIB}" \
 	INSTALLDIR="${STAGEDIR}${MLROOT}" \
 	CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' \
-	AS='${AS}' ASFLAGS='${ASFLAGS}' EXTRA_DEFS='${EXTRA_DEFS}' \
+	AS='${AS}' ASFLAGS='${ASFLAGS}' CPPASFLAGS='${CPPASFLAGS}' \
+	EXTRA_DEFS='${EXTRA_DEFS}' \
 	./config/install.sh
 .else
 	@${ECHO} '(* Rebuilding the recompiled libs: *)'
@@ -320,7 +316,8 @@ do-install:
 	STAGEDIR="${STAGEDIR}" MLLIB="${MLLIB}" \
 	INSTALLDIR="${STAGEDIR}${MLROOT}" RECOMPILEDIR="${RECOMPILEDIR}" \
 	CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' \
-	AS='${AS}' ASFLAGS='${ASFLAGS}' EXTRA_DEFS='${EXTRA_DEFS}' \
+	AS='${AS}' ASFLAGS='${ASFLAGS}' CPPASFLAGS='${CPPASFLAGS}' \
+	EXTRA_DEFS='${EXTRA_DEFS}' \
 	./config/install.sh
 .endif
 	@${ECHO} '(* Installing man pages. *)'
diff --git a/lang/smlnj/distinfo b/lang/smlnj/distinfo
index 0eed6ad8b461..d7c20d1d8a26 100644
--- a/lang/smlnj/distinfo
+++ b/lang/smlnj/distinfo
@@ -1,47 +1,47 @@
-TIMESTAMP = 1545084427
-SHA256 (smlnj/110.84/MLRISC.tgz) = da3c5236018fa7608863c2fe1f3c57b60013df98b5a249fb3d4edc738cdfd072
-SIZE (smlnj/110.84/MLRISC.tgz) = 1458550
-SHA256 (smlnj/110.84/asdl.tgz) = 8be712200dc186b8bbe79b3ae111f2c490bf74f4709882d3459ac061f66b5b8e
-SIZE (smlnj/110.84/asdl.tgz) = 193047
-SHA256 (smlnj/110.84/boot.x86-unix.tgz) = a29e3b0ca623da197e9c18ea64db4c2a08fe5e6add85c0d053c4ecfa653ace82
-SIZE (smlnj/110.84/boot.x86-unix.tgz) = 5762714
-SHA256 (smlnj/110.84/ckit.tgz) = 7e2534e393d2372cad8ff9ddd306881db91bbbcc2b0e0538e76868c86c658c36
-SIZE (smlnj/110.84/ckit.tgz) = 198419
-SHA256 (smlnj/110.84/cm.tgz) = 7055c60481a887f27a5135ac1f33233565b99a7c99c4aa73e023e28e629b0663
-SIZE (smlnj/110.84/cm.tgz) = 220278
-SHA256 (smlnj/110.84/cml.tgz) = 556110c746db863211ac8a97e1bf097b0e5d45dfea4b3e8194b6c389ac2b569a
-SIZE (smlnj/110.84/cml.tgz) = 105655
-SHA256 (smlnj/110.84/compiler.tgz) = 6d23aff2e75727bf6969b05a070128f187e06f60408aabf6a71e0475326fee87
-SIZE (smlnj/110.84/compiler.tgz) = 862298
-SHA256 (smlnj/110.84/config.tgz) = 1810d3ca768222e120c7a3f2f93aafd652705371fc73929423c671dce3cef832
-SIZE (smlnj/110.84/config.tgz) = 514275
-SHA256 (smlnj/110.84/doc.tgz) = 0ed69456e4c2b851f475057a94da406c80f46cdd02a5d9077670be33122c7020
-SIZE (smlnj/110.84/doc.tgz) = 2029114
-SHA256 (smlnj/110.84/eXene.tgz) = 3fe1c6a1a334e7d7359fbcfd053066c88cb7705a90975b60fff946554aa0019c
-SIZE (smlnj/110.84/eXene.tgz) = 720713
-SHA256 (smlnj/110.84/heap2asm.tgz) = 3d33c52b650536762d47534f07709e749cc821ce515aef2fb9a746db11433e95
-SIZE (smlnj/110.84/heap2asm.tgz) = 1343
-SHA256 (smlnj/110.84/ml-burg.tgz) = 62ea37b13788078e3ea77d3b870da42788153c348009f827f2c0b05cfc07d918
-SIZE (smlnj/110.84/ml-burg.tgz) = 40510
-SHA256 (smlnj/110.84/ml-lex.tgz) = cc7e045aa9667f1eed055db1defca0e830eed34c08f3dfdf37f698964fe04070
-SIZE (smlnj/110.84/ml-lex.tgz) = 27833
-SHA256 (smlnj/110.84/ml-lpt.tgz) = 2f60e1467a69fd4fb5501354244337926bc2a65225dde328f6aa3883b14fb3a5
-SIZE (smlnj/110.84/ml-lpt.tgz) = 267076
-SHA256 (smlnj/110.84/ml-yacc.tgz) = cfebaeb5f08810fcc93c49bf171834b7bf14b5f7e76d206e0afa35e18887bdb9
-SIZE (smlnj/110.84/ml-yacc.tgz) = 101692
-SHA256 (smlnj/110.84/nlffi.tgz) = 8b96a82a3d63b000b70a1b982aab9750ce9caa77f316f6a923969e86b0133f31
-SIZE (smlnj/110.84/nlffi.tgz) = 75036
-SHA256 (smlnj/110.84/old-basis.tgz) = cf15fe5c242f19f0605cd38a7bef3c1ebc89d5204c4cf68fac479198dd9fed93
-SIZE (smlnj/110.84/old-basis.tgz) = 1080
-SHA256 (smlnj/110.84/pgraph.tgz) = aa2f14de13a540dbc370b45757156c0b03516a5b8f97b5759292841d7b7ac1cb
-SIZE (smlnj/110.84/pgraph.tgz) = 5432
-SHA256 (smlnj/110.84/runtime.tgz) = 5fcf4bbdeaddb247f69a333d2295f5f5c0be55b1f86ff4fbffb63f0021d84d6c
-SIZE (smlnj/110.84/runtime.tgz) = 355339
-SHA256 (smlnj/110.84/smlnj-c.tgz) = 145a513becb4c98991af7eae81ae19b8fff336458f1f011eafdc283cb76deee9
-SIZE (smlnj/110.84/smlnj-c.tgz) = 10623
-SHA256 (smlnj/110.84/smlnj-lib.tgz) = 3356924655277416d8a491c1d601a0f567ab3d15cb17e243620e85cb28f0e9dd
-SIZE (smlnj/110.84/smlnj-lib.tgz) = 456254
-SHA256 (smlnj/110.84/system.tgz) = f46b1de790000a98f4aa9830325d39cb1e4867338d4db6b8a102084db1512218
-SIZE (smlnj/110.84/system.tgz) = 261237
-SHA256 (smlnj/110.84/trace-debug-profile.tgz) = ecc54281b8654c75f8b9d4ebdf1ff67de71ef31297cf1b14115cd75645e46a5a
-SIZE (smlnj/110.84/trace-debug-profile.tgz) = 3939
+TIMESTAMP = 1564231693
+SHA256 (smlnj/110.91/MLRISC.tgz) = aa521ef48da51ab2cfe82098457d96b3ebc32217132e6e8b56d383543fe23ab1
+SIZE (smlnj/110.91/MLRISC.tgz) = 1459472
+SHA256 (smlnj/110.91/asdl.tgz) = e8fa7c033776c6fa78c4f95e28af79a86c37b5548bfcfb0114cd532a83a823de
+SIZE (smlnj/110.91/asdl.tgz) = 202161
+SHA256 (smlnj/110.91/boot.x86-unix.tgz) = a8d8d4cf85b5c0bbc5f254f46f9a0eb039a7bc704d18d41bf9a1be0c9d25dd38
+SIZE (smlnj/110.91/boot.x86-unix.tgz) = 6034212
+SHA256 (smlnj/110.91/ckit.tgz) = 6d8f99d57fff2a210c3ecfd592841bca843f2b5e6697fe35340c6a1095a409d3
+SIZE (smlnj/110.91/ckit.tgz) = 200998
+SHA256 (smlnj/110.91/cm.tgz) = cd9bba3d54252197de3b7b4236cba90fec32e1aedb5df1c75af440ee8406ab73
+SIZE (smlnj/110.91/cm.tgz) = 220371
+SHA256 (smlnj/110.91/cml.tgz) = 6ea50839c19c4fcf5880769401914b4c19b2c674942e131e7b2de56dfb8d5fea
+SIZE (smlnj/110.91/cml.tgz) = 105339
+SHA256 (smlnj/110.91/compiler.tgz) = 70bef5bf9ba91ebb8067d335285be0bf9c127f5275ed9d4a14a6f81d99370047
+SIZE (smlnj/110.91/compiler.tgz) = 839212
+SHA256 (smlnj/110.91/config.tgz) = 6690de2e4fa134db8e85ccc5bc58745cdd321a2cf72453c5116e3e7ea7786b03
+SIZE (smlnj/110.91/config.tgz) = 515708
+SHA256 (smlnj/110.91/doc.tgz) = a12807833ae18484d486a503d8a106304082724985d320fd15f347a65b481dd0
+SIZE (smlnj/110.91/doc.tgz) = 2073179
+SHA256 (smlnj/110.91/eXene.tgz) = c435d78915a96c6079847aca882d89401c7aad5bcdaff9cad8a5639a215b9411
+SIZE (smlnj/110.91/eXene.tgz) = 720702
+SHA256 (smlnj/110.91/heap2asm.tgz) = 1269b7e3a12e966ab73b463bc16a9bbf5c5acbe84d6acfd509a027854c918f25
+SIZE (smlnj/110.91/heap2asm.tgz) = 1345
+SHA256 (smlnj/110.91/ml-burg.tgz) = 337e67312edd555a6f0f697198a832c2c181c8f71cace792dbc9ce9565c13585
+SIZE (smlnj/110.91/ml-burg.tgz) = 40514
+SHA256 (smlnj/110.91/ml-lex.tgz) = f9b1ab56f981cc3edccaa106b8c1f95b1786ed3274eefd7422201c5ac85b5574
+SIZE (smlnj/110.91/ml-lex.tgz) = 27834
+SHA256 (smlnj/110.91/ml-lpt.tgz) = 8e95cb33c3ceb8f3d011a2c88cdea37d530d69fd472a3642df67f36fc7015d55
+SIZE (smlnj/110.91/ml-lpt.tgz) = 267088
+SHA256 (smlnj/110.91/ml-yacc.tgz) = 2bdcb0b60cb09063865f485cabcbe5b8e7e5ebc559499f6c0fcdf8c02f5f3728
+SIZE (smlnj/110.91/ml-yacc.tgz) = 101693
+SHA256 (smlnj/110.91/nlffi.tgz) = b22b63471cfef6217706ec6da75357e36e45b185e3c3f2c791933dca22a755f6
+SIZE (smlnj/110.91/nlffi.tgz) = 75070
+SHA256 (smlnj/110.91/old-basis.tgz) = 9098c4b3ec7496224020093e034ff728eadcc10ba7249810f9b1a16bb64b18ae
+SIZE (smlnj/110.91/old-basis.tgz) = 1082
+SHA256 (smlnj/110.91/pgraph.tgz) = e8620b4a458739a38f5d28ca22092273bf8cdb7fc30b3057123f238407acf2e8
+SIZE (smlnj/110.91/pgraph.tgz) = 5429
+SHA256 (smlnj/110.91/runtime.tgz) = e91ff66b5de40cfdc8a8d78200faae62522b601d0dd10c7647a30e5f37b9a84e
+SIZE (smlnj/110.91/runtime.tgz) = 349128
+SHA256 (smlnj/110.91/smlnj-c.tgz) = 043cdf239c777fc50a5b04752a6961a2e0aa1cdeb4a8d38bc04943e63b839dbc
+SIZE (smlnj/110.91/smlnj-c.tgz) = 10622
+SHA256 (smlnj/110.91/smlnj-lib.tgz) = 5c9323c4158bbb55159a7ce304643bc523461dbc856d9389bc19aa533d106a26
+SIZE (smlnj/110.91/smlnj-lib.tgz) = 457827
+SHA256 (smlnj/110.91/system.tgz) = 0b840476580689695a62b79f92ef383e6b20991002812abb349e1e9b83dea599
+SIZE (smlnj/110.91/system.tgz) = 262075
+SHA256 (smlnj/110.91/trace-debug-profile.tgz) = bb55c348e907e47a36f9e67f6b834d06186bdaa8cde1e20c2f96095ed70deebf
+SIZE (smlnj/110.91/trace-debug-profile.tgz) = 3936
diff --git a/lang/smlnj/files/do-patch-asdl_configure b/lang/smlnj/files/do-patch-asdl_configure
index 60c84a4fc880..1a5553800c78 100644
--- a/lang/smlnj/files/do-patch-asdl_configure
+++ b/lang/smlnj/files/do-patch-asdl_configure
@@ -1,5 +1,6 @@
-+++ asdl/configure	2018-12-17 15:01:00.142964000 +0100
-@@ -4893,6 +4893,7 @@
+--- asdl/configure.orig	2019-06-20 16:01:17 UTC
++++ asdl/configure
+@@ -4893,6 +4893,7 @@ $as_echo "$SMLNJ_VERSION" >&6; }
      sparc:solaris2*)	SMLNJ_ARCH=sparc;	SMLNJ_OPSYS=sunos;;
      sparc:solaris3*)	SMLNJ_ARCH=sparc;	SMLNJ_OPSYS=solaris;;
      x86_64:linux*)	SMLNJ_ARCH=x86;		SMLNJ_OPSYS=linux;;
diff --git a/lang/smlnj/files/do-patch-asdl_src_asdlgen_Makefile.in b/lang/smlnj/files/do-patch-asdl_src_asdlgen_Makefile.in
index 1854b864e303..523120c95426 100644
--- a/lang/smlnj/files/do-patch-asdl_src_asdlgen_Makefile.in
+++ b/lang/smlnj/files/do-patch-asdl_src_asdlgen_Makefile.in
@@ -1,6 +1,6 @@
---- asdl/src/asdlgen/Makefile.in.orig	2018-08-28 17:36:58.000000000 +0200
-+++ asdl/src/asdlgen/Makefile.in	2018-12-17 21:42:50.793253000 +0100
-@@ -54,8 +54,10 @@
+--- asdl/src/asdlgen/Makefile.in.orig	2018-08-28 15:36:58 UTC
++++ asdl/src/asdlgen/Makefile.in
+@@ -54,8 +54,10 @@ CM_FILES =		back-end/sml/sources.cm \
  
  CODE_FRAG_DIRS =	back-end/sml
  
@@ -13,7 +13,7 @@
  
  SRCDIR =		@ASDLGEN_SRCDIR@
  
-@@ -94,14 +96,18 @@
+@@ -94,14 +96,18 @@ back-end/sml/fragments.sml:
  	touch .depend
  	$(ML_MAKEDEPEND) $(ML_MAKEDEPEND_FLAGS) -n -f .depend $(ROOT_CM) $(HEAP) || rm -f .depend
  
diff --git a/lang/smlnj/files/do-patch-base_compiler_Parse_lex_ml.lex b/lang/smlnj/files/do-patch-base_compiler_Parse_lex_ml.lex
index 9028d94af800..a3920d4cb624 100644
--- a/lang/smlnj/files/do-patch-base_compiler_Parse_lex_ml.lex
+++ b/lang/smlnj/files/do-patch-base_compiler_Parse_lex_ml.lex
@@ -1,6 +1,6 @@
---- base/compiler/Parse/lex/ml.lex.orig	2018-05-28 19:11:09.000000000 +0200
-+++ base/compiler/Parse/lex/ml.lex	2018-07-27 17:27:36.367358000 +0200
-@@ -66,7 +66,7 @@
+--- base/compiler/Parse/lex/ml.lex.orig	2018-05-28 17:11:09 UTC
++++ base/compiler/Parse/lex/ml.lex
+@@ -66,7 +66,7 @@ exp=[eE](~?){num};
  real=(~?)(({num}{frac}?{exp})|({num}{frac}{exp}?));
  xdigit=[0-9a-fA-F];
  hexnum={xdigit}+;
@@ -8,3 +8,4 @@
 +bad_escape=\\(]|[-\000-\008\011\012\014-\031 !#$%&'()*+,./:;<=>?@A-Z\[_`c-eg-mo-qsuw-z{}|~\127]);
  
  %%
+ <INITIAL>{ws}	=> (continue());
diff --git a/lang/smlnj/files/do-patch-base_compiler_Parse_lex_sml.lex b/lang/smlnj/files/do-patch-base_compiler_Parse_lex_sml.lex
index dff9f0694c4e..083869374ba8 100644
--- a/lang/smlnj/files/do-patch-base_compiler_Parse_lex_sml.lex
+++ b/lang/smlnj/files/do-patch-base_compiler_Parse_lex_sml.lex
@@ -1,6 +1,6 @@
---- base/compiler/Parse/lex/sml.lex.orig	2018-05-28 19:11:09.000000000 +0200
-+++ base/compiler/Parse/lex/sml.lex	2018-07-27 17:58:18.054955000 +0200
-@@ -114,7 +114,7 @@
+--- base/compiler/Parse/lex/sml.lex.orig	2018-05-28 17:11:09 UTC
++++ base/compiler/Parse/lex/sml.lex
+@@ -114,7 +114,7 @@ hexnum={xdigit}("_"*{xdigit})*;
  frac="."{num};
  exp=[eE](~?){num};
  real=(~?)(({num}{frac}?{exp})|({num}{frac}{exp}?));
diff --git a/lang/smlnj/files/do-patch-base_runtime_include_ml-unixdep.h b/lang/smlnj/files/do-patch-base_runtime_include_ml-unixdep.h
index 6c375a68cf20..b8f8ef12a268 100644
--- a/lang/smlnj/files/do-patch-base_runtime_include_ml-unixdep.h
+++ b/lang/smlnj/files/do-patch-base_runtime_include_ml-unixdep.h
@@ -1,25 +1,35 @@
---- base/runtime/include/ml-unixdep.h.orig	2014-08-17 21:09:56.000000000 +0200
-+++ base/runtime/include/ml-unixdep.h	2014-08-23 22:24:36.475122070 +0200
-@@ -33,6 +33,7 @@
-  *   HAS_UCONTEXT		if signal handlers have a ucontext_t argument.
-  *   HAS_STRERROR		if the system provides the ISO C strerror function.
+--- base/runtime/include/ml-unixdep.h.orig	2019-06-19 18:37:43 UTC
++++ base/runtime/include/ml-unixdep.h
+@@ -37,6 +37,7 @@
   *   INT_GIDLIST		if the second argument to getgroups is int[].
+  *   STAT_HAS_TIMESPEC		if the time fields in the "struct stat" type have
+  *				type "struct timespec".
 + *   HAS_MKSTEMP		if OS provides the POSIX mkstemp function.
   *
   * Note that only one of the following sets of symbols should be defined:
   *   { HAS_MMAP, HAS_ANON_MMAP, HAS_VM_ALLOCATE }
-@@ -295,6 +296,7 @@
- #  define HAS_ILOGB
+@@ -94,6 +95,7 @@
+ #  define HAS_POLL
  #  define HAS_SIGCONTEXT
  #  define HAS_STRERROR
 +#  define HAS_MKSTEMP
  
+ /* These declarations are not in <errno.h> */
+ extern int	sys_nerr;
+@@ -204,6 +206,7 @@ extern char	*sys_errlist[];
+ #  define HAS_SIGCONTEXT
+ #  define HAS_STRERROR
+ #  define STAT_HAS_TIMESPEC
++#  define HAS_MKSTEMP
+ 
  /* FreeBSD uses MAP_ANON for MAP_ANONYMOUS */
  #  define MAP_ANONYMOUS MAP_ANON
-@@ -377,6 +379,15 @@
- #  define __EXTENSIONS__
- #endif
+@@ -254,6 +257,16 @@ extern char	*sys_errlist[];
  
+ #include <features.h>
+ 
++#endif
++
 +#if defined(OPSYS_FREEBSD)
 +#  if defined(INCLUDE_FREEBSD_I386__TYPES)
 +#    include <sys/cdefs.h>
@@ -28,7 +38,6 @@
 +#  if defined(INCLUDE_FREEBSD_I386_SIGNAL)
 +#    include INCLUDE_FREEBSD_I386_SIGNAL
 +#  endif
-+#endif
- #include INCLUDE_TYPES_H
+ #endif
+ 
  #include <unistd.h>
- #include <string.h>
diff --git a/lang/smlnj/files/do-patch-base_runtime_mach-dep_signal-sysdep.h b/lang/smlnj/files/do-patch-base_runtime_mach-dep_signal-sysdep.h
deleted file mode 100644
index 23eabda0b155..000000000000
--- a/lang/smlnj/files/do-patch-base_runtime_mach-dep_signal-sysdep.h
+++ /dev/null
@@ -1,24 +0,0 @@
---- base/runtime/mach-dep/signal-sysdep.h.orig	2017-08-27 15:28:34.000000000 +0200
-+++ base/runtime/mach-dep/signal-sysdep.h	2018-03-17 18:49:11.672602000 +0100
-@@ -447,8 +447,8 @@
- #  elif defined(OPSYS_FREEBSD)
-     /** x86, FreeBSD **/
- #    define SIG_FAULT1		SIGFPE
--#    define INT_DIVZERO(s, c)	(((s) == SIGFPE) && ((c) == FPE_INTDIV_TRAP))
--#    define INT_OVFLW(s, c)	(((s) == SIGFPE) && ((c) == FPE_INTOVF_TRAP))
-+#    define INT_DIVZERO(s, c)	(((s) == SIGFPE) && ((c) == FPE_INTDIV))
-+#    define INT_OVFLW(s, c)	(((s) == SIGFPE) && ((c) == FPE_INTOVF))
- 
- #    define SIG_GetCode(info, scp)	(info)
- #    define SIG_GetPC(scp)		((scp)->sc_pc)
-@@ -568,8 +568,8 @@
- #  elif defined(OPSYS_FREEBSD)
-     /** amd64, FreeBSD **/
- #    define SIG_FAULT1		SIGFPE
--#    define INT_DIVZERO(s, c)	(((s) == SIGFPE) && ((c) == FPE_INTDIV_TRAP))
--#    define INT_OVFLW(s, c)	(((s) == SIGFPE) && ((c) == FPE_INTOVF_TRAP))
-+#    define INT_DIVZERO(s, c)	(((s) == SIGFPE) && ((c) == FPE_INTDIV))
-+#    define INT_OVFLW(s, c)	(((s) == SIGFPE) && ((c) == FPE_INTOVF))
- 
- #    define SIG_GetCode(info, scp)	(info)
- #    define SIG_GetPC(scp)		((scp)->sc_pc)
diff --git a/lang/smlnj/files/do-patch-base_runtime_objs_makefile b/lang/smlnj/files/do-patch-base_runtime_objs_makefile
index b4bdb31fa154..081ca5914c77 100644
--- a/lang/smlnj/files/do-patch-base_runtime_objs_makefile
+++ b/lang/smlnj/files/do-patch-base_runtime_objs_makefile
@@ -1,6 +1,6 @@
---- base/runtime/objs/makefile.orig	2012-04-18 02:28:08.000000000 +0200
-+++ base/runtime/objs/makefile	2018-12-20 21:57:09.499392000 +0100
-@@ -5,10 +5,11 @@
+--- base/runtime/objs/makefile.orig	2019-06-18 21:06:21 UTC
++++ base/runtime/objs/makefile
+@@ -5,10 +5,12 @@
  
  SHELL =		/bin/sh
  MAKE =		make
@@ -12,10 +12,11 @@
 -AS =		as
 +AS ?=		as
 +ASFLAGS ?=
++CPPASFLAGS ?=
  AR =		ar
  ARFLAGS =	rcv
  RANLIB =	ranlib
-@@ -38,7 +39,7 @@
+@@ -38,7 +40,7 @@ BC_DIR =	$(ROOT_DIR)/bytecode
  CLIB_DIR =	$(ROOT_DIR)/c-libs
  CONFIG_DIR =	$(ROOT_DIR)/config
  
@@ -24,16 +25,18 @@
  
  INCLUDES =	-I$(OBJS_DIR) -I$(INC_DIR)
  GC_INCLUDES =	$(INCLUDES) -I$(GC_DIR)
-@@ -275,7 +276,7 @@
+@@ -275,8 +277,8 @@ prim.o:		$(MACH_DIR)/$(TARGET).prim.asm \
  		$(INC_DIR)/asm-base.h \
+ 		$(MACH_DIR)/x86-syntax.h \
  		mlstate-offsets.h
- 	$(CPP) -D_ASM_ $(DEFS) -I$(BC_DIR) $(INCLUDES) $(MACH_DIR)/$(TARGET).prim.asm > prim.s
+-	$(CPP) -D_ASM_ $(DEFS) $(INCLUDES) $(MACH_DIR)/$(TARGET).prim.asm > prim.s
 -	$(AS) -o prim.o prim.s
-+	$(AS) ${ASFLAGS} -o prim.o prim.s
++	$(CPP) -D_ASM_ $(DEFS) $(CPPASFLAGS) $(INCLUDES) $(MACH_DIR)/$(TARGET).prim.asm > prim.s
++	$(AS) $(ASFLAGS) -o prim.o prim.s
  
  $(MACH_DIR)/BYTECODE.prim.asm: bc-instr-def.h $(BC_DIR)/bc-instrs.h $(BC_DIR)/bc.h
  
-@@ -317,7 +318,7 @@
+@@ -318,7 +320,7 @@ memory-trace.o:	$(BC_DIR)/memory-trace.c \
  primops.o:	$(BC_DIR)/primops.asm \
  		$(INC_DIR)/asm-base.h
  	$(CPP) -D_ASM_ $(DEFS) $(INCLUDES) $(BC_DIR)/primops.asm > primops.s
@@ -42,7 +45,7 @@
  
  bc-instr-def.h:	gen-bc-instr-def \
  		$(BC_DIR)/bc.h $(BC_DIR)/print-bc.h
-@@ -329,7 +330,7 @@
+@@ -330,7 +332,7 @@ bc-instr-def.h:	gen-bc-instr-def \
  #
  MK_ARGS =		VERSION="$(VERSION)" \
  			MAKE="$(MAKE)" \
@@ -51,7 +54,7 @@
  			AR="$(AR)" ARFLAGS="$(ARFLAGS)" \
  			RANLIB="$(RANLIB)" \
  			INCLUDES="$(GC_INCLUDES) -I../bytecode"
-@@ -420,7 +421,7 @@
+@@ -421,7 +423,7 @@ LIB_INCLUDES =	-I$(LIB_OBJS_DIR) -I$(LIB_INC_DIR) -I..
  #
  LIB_MK_ARGS =		VERSION="$(VERSION)" \
  			MAKE="$(MAKE)" \
diff --git a/lang/smlnj/files/do-patch-base_runtime_objs_mk.x86-freebsd b/lang/smlnj/files/do-patch-base_runtime_objs_mk.x86-freebsd
index b30ececfeb6b..58bacfb4a14b 100644
--- a/lang/smlnj/files/do-patch-base_runtime_objs_mk.x86-freebsd
+++ b/lang/smlnj/files/do-patch-base_runtime_objs_mk.x86-freebsd
@@ -1,5 +1,5 @@
---- base/runtime/objs/mk.x86-freebsd.orig	2006-04-20 17:28:53.000000000 +0200
-+++ base/runtime/objs/mk.x86-freebsd	2018-12-20 21:55:00.154477000 +0100
+--- base/runtime/objs/mk.x86-freebsd.orig	2006-04-20 15:28:53 UTC
++++ base/runtime/objs/mk.x86-freebsd
 @@ -5,19 +5,19 @@
  
  SHELL =		/bin/sh
@@ -25,7 +25,7 @@
  TARGET =	X86
  VERSION =	v-x86-freebsd
  RUNTIME =	run.x86-freebsd
-@@ -25,6 +25,6 @@
+@@ -25,6 +25,6 @@ RUNTIME_SO =	run.x86-freebsd.so
  RUNTIME_A =	run.x86-freebsd.a
  
  all:
diff --git a/lang/smlnj/files/do-patch-eXene_lib_protocol_xreply.sml b/lang/smlnj/files/do-patch-eXene_lib_protocol_xreply.sml
new file mode 100644
index 000000000000..e64fd65b29b7
--- /dev/null
+++ b/lang/smlnj/files/do-patch-eXene_lib_protocol_xreply.sml
@@ -0,0 +1,11 @@
+--- eXene/lib/protocol/xreply.sml.orig	2006-03-03 03:33:16 UTC
++++ eXene/lib/protocol/xreply.sml
+@@ -51,7 +51,7 @@ structure XReply =
+       fun get32 (s, i) = Word32.fromLargeWord(PackWord32Big.subVec(s, i div 4))
+       fun getSigned32 (s, i) =
+         Int32.fromLarge(LargeWord.toLargeInt(PackWord32Big.subVecX(s, i div 4)))
+-      fun getWord (s, i) = Word.fromLargeWord(get32(s, i))
++      fun getWord (s, i) = Word.fromLargeWord(PackWord32Big.subVec(s, i div 4))
+       fun getInt (s, i) = LargeWord.toIntX(PackWord32Big.subVecX(s, i div 4))
+ 
+       val w8vextract = Word8VectorSlice.vector o Word8VectorSlice.slice
diff --git a/lang/smlnj/files/do-patch-eXene_lib_protocol_xrequest.sml b/lang/smlnj/files/do-patch-eXene_lib_protocol_xrequest.sml
new file mode 100644
index 000000000000..98131746c5b5
--- /dev/null
+++ b/lang/smlnj/files/do-patch-eXene_lib_protocol_xrequest.sml
@@ -0,0 +1,11 @@
+--- eXene/lib/protocol/xrequest.sml.orig	2005-11-07 23:03:18 UTC
++++ eXene/lib/protocol/xrequest.sml
+@@ -84,7 +84,7 @@ structure XRequest =
+ 	    putSigned16(buf, i+8, border))
+ 
+       fun putTS (buf, i, XTy.CurrentTime) = put32(buf, i, 0w0)
+-	| putTS (buf, i, XTy.TimeStamp(XTime.XT t)) = put32(buf, i, t)
++	| putTS (buf, i, XTy.TimeStamp(XTime.XT t)) = put32(buf, i, Word32.toLarge t)
+ 
+       fun putRGB (buf, i, XTy.RGB{red, green, blue}) = (
+ 	    putWord16(buf, i, red);
diff --git a/lang/smlnj/files/do-patch-eXene_lib_protocol_xsendevt.sml b/lang/smlnj/files/do-patch-eXene_lib_protocol_xsendevt.sml
new file mode 100644
index 000000000000..fbde34b46486
--- /dev/null
+++ b/lang/smlnj/files/do-patch-eXene_lib_protocol_xsendevt.sml
@@ -0,0 +1,11 @@
+--- eXene/lib/protocol/xsendevt.sml.orig	2005-11-02 22:24:39 UTC
++++ eXene/lib/protocol/xsendevt.sml
+@@ -46,7 +46,7 @@ structure XSendEvent =
+ 	| putAtomOption (buf, i, SOME(XTy.XAtom n)) = putWord32 (buf, i, n)
+ 
+       fun putTS (buf, i, XTy.CurrentTime) = put32(buf, i, 0w0)
+-	| putTS (buf, i, XTy.TimeStamp(XTime.XT t)) = put32(buf, i, t)
++	| putTS (buf, i, XTy.TimeStamp(XTime.XT t)) = put32(buf, i, Word32.toLarge t)
+ 
+     (* event codes *)
+       val evtKeyPressXEvt	= 0w2 : Word8.word
diff --git a/lang/smlnj/files/do-patch-smlnj-lib_JSON_json-parser.sml b/lang/smlnj/files/do-patch-smlnj-lib_JSON_json-parser.sml
index 864cc1756e1b..52282ea50379 100644
--- a/lang/smlnj/files/do-patch-smlnj-lib_JSON_json-parser.sml
+++ b/lang/smlnj/files/do-patch-smlnj-lib_JSON_json-parser.sml
@@ -1,6 +1,6 @@
---- smlnj-lib/JSON/json-parser.sml.orig	2011-05-10 20:58:08.000000000 +0200
-+++ smlnj-lib/JSON/json-parser.sml	2017-10-03 22:49:26.569924000 +0200
-@@ -22,6 +22,26 @@
+--- smlnj-lib/JSON/json-parser.sml.orig	2011-05-10 18:58:08 UTC
++++ smlnj-lib/JSON/json-parser.sml
+@@ -22,6 +22,26 @@ structure JSONParser : sig
  		  msg, ", found '", JSONTokens.toString tok, "'"
  		])
  	  val lexer = Lex.lex srcMap
@@ -27,7 +27,7 @@
  	  fun parseValue (strm : Lex.strm) = let
  		val (tok, pos, strm) = lexer strm
  		in
-@@ -37,50 +57,29 @@
+@@ -37,50 +57,29 @@ structure JSONParser : sig
  		    | _ => error (pos, "parsing value", tok)
  		  (* end case *)
  		end
diff --git a/lang/smlnj/files/do-patch-smlnj-lib_JSON_json-stream-printer.sml b/lang/smlnj/files/do-patch-smlnj-lib_JSON_json-stream-printer.sml
index cf92e1ed2d51..51c8c0526de5 100644
--- a/lang/smlnj/files/do-patch-smlnj-lib_JSON_json-stream-printer.sml
+++ b/lang/smlnj/files/do-patch-smlnj-lib_JSON_json-stream-printer.sml
@@ -1,6 +1,6 @@
---- smlnj-lib/JSON/json-stream-printer.sml.orig	2017-07-14 22:32:40.000000000 +0200
-+++ smlnj-lib/JSON/json-stream-printer.sml	2017-10-25 20:33:53.541874000 +0200
-@@ -103,14 +103,14 @@
+--- smlnj-lib/JSON/json-stream-printer.sml.orig	2017-07-14 20:32:40 UTC
++++ smlnj-lib/JSON/json-stream-printer.sml
+@@ -103,14 +103,14 @@ structure JSONStreamPrinter : sig
  	  fun tr (i, chrs) = (case getWChar i
  		 of SOME(wchr, i) => if (wchr <= 0w126)
  		      then (case UTF8.toAscii wchr
diff --git a/lang/smlnj/files/do-patch-smlnj-lib_JSON_json-util.sml b/lang/smlnj/files/do-patch-smlnj-lib_JSON_json-util.sml
index 6bfb3361fbf6..899d29638aad 100644
--- a/lang/smlnj/files/do-patch-smlnj-lib_JSON_json-util.sml
+++ b/lang/smlnj/files/do-patch-smlnj-lib_JSON_json-util.sml
@@ -1,6 +1,6 @@
---- smlnj-lib/JSON/json-util.sml.orig	2017-04-29 17:39:27.000000000 +0200
-+++ smlnj-lib/JSON/json-util.sml	2017-10-04 00:40:39.574909000 +0200
-@@ -133,7 +133,7 @@
+--- smlnj-lib/JSON/json-util.sml.orig	2017-04-29 15:39:27 UTC
++++ smlnj-lib/JSON/json-util.sml
+@@ -133,7 +133,7 @@ structure JSONUtil : sig
  
      fun lookupField (v as J.OBJECT fields) = let
  	  fun find lab = (case List.find (fn (l, v) => (l = lab)) fields
@@ -9,7 +9,7 @@
  		  | SOME(_, v) => v
  		(* end case *))
  	  in
-@@ -197,7 +197,7 @@
+@@ -197,7 +197,7 @@ structure JSONUtil : sig
      fun get (v, []) = v
        | get (v as J.OBJECT fields, SEL lab :: rest) =
  	  (case List.find (fn (l, v) => (l = lab)) fields
@@ -18,7 +18,7 @@
  	    | SOME(_, v) => get (v, rest)
  	  (* end case *))
        | get (v, SEL _ :: _) = raise NotObject v
-@@ -222,7 +222,7 @@
+@@ -222,7 +222,7 @@ structure JSONUtil : sig
    (* follow a path into a JSON value while constructing a zipper *)
      fun unzip (v, []) = (ZNIL, v)
        | unzip (v as J.OBJECT fields, SEL lab :: rest) = let
diff --git a/lang/smlnj/files/patch-config___arch-n-opsys b/lang/smlnj/files/patch-config___arch-n-opsys
index 60321135842b..3d9ca98a4c99 100644
--- a/lang/smlnj/files/patch-config___arch-n-opsys
+++ b/lang/smlnj/files/patch-config___arch-n-opsys
@@ -1,6 +1,6 @@
---- config/_arch-n-opsys.orig	2018-06-22 14:49:01 UTC
+--- config/_arch-n-opsys.orig	2019-05-31 12:15:03 UTC
 +++ config/_arch-n-opsys
-@@ -91,6 +91,8 @@ case `uname -s` in
+@@ -97,6 +97,8 @@ case `uname -s` in
      HEAP_OPSYS=bsd
      case `uname -m` in
        *86) ARCH=x86;;
diff --git a/lang/smlnj/files/patch-config___heap2exec b/lang/smlnj/files/patch-config___heap2exec
index 5cd476af6907..a7cc36507053 100644
--- a/lang/smlnj/files/patch-config___heap2exec
+++ b/lang/smlnj/files/patch-config___heap2exec
@@ -1,6 +1,6 @@
---- config/_heap2exec.orig	2006-04-20 15:28:53 UTC
+--- config/_heap2exec.orig	2019-05-31 12:36:14 UTC
 +++ config/_heap2exec
-@@ -83,6 +83,7 @@ SO_LIBS=
+@@ -89,6 +89,7 @@ SO_LIBS=
  A_PROG=
  A_FLAGS=
  A_LIBS=
@@ -8,7 +8,7 @@
  
  case ${OPSYS} in
  	darwin)
-@@ -96,6 +97,13 @@ case ${OPSYS} in
+@@ -102,6 +103,13 @@ case ${OPSYS} in
  		A_PROG=${CC}
  		A_FLAGS=-Wl,--export-dynamic
  		A_LIBS=-lm
@@ -22,7 +22,7 @@
  		;;
  	linux)
  		SO_PROG=${CC}
-@@ -116,7 +124,7 @@ fi
+@@ -122,7 +130,7 @@ fi
  RESULT=0
  if ${H2A} "$heapfile" "$execfile".s ; then
  	if [ -f "$execfile".s ] ; then
diff --git a/lang/smlnj/files/patch-config_install.sh b/lang/smlnj/files/patch-config_install.sh
index a0f4b6e381f2..b447053ed3f9 100644
--- a/lang/smlnj/files/patch-config_install.sh
+++ b/lang/smlnj/files/patch-config_install.sh
@@ -1,4 +1,4 @@
---- config/install.sh.orig	2018-08-28 15:30:41 UTC
+--- config/install.sh.orig	2019-05-31 12:15:03 UTC
 +++ config/install.sh
 @@ -17,6 +17,8 @@ else
      nolib=false
@@ -68,7 +68,7 @@
  #
  # the release version that we are installing
  #
-@@ -344,7 +389,12 @@ fi
+@@ -371,7 +416,12 @@ esac
  # the name of the bin files directory
  #
  BOOT_ARCHIVE=boot.$ARCH-unix
@@ -82,7 +82,7 @@
  
  #
  # build the run-time system
-@@ -353,9 +403,15 @@ if [ -x "$RUNDIR"/run.$ARCH-$OPSYS ]; then
+@@ -380,9 +430,15 @@ if [ -x "$RUNDIR"/run.$ARCH-$OPSYS ]; then
      vsay $this: Run-time system already exists.
  else
      "$CONFIGDIR"/unpack "$ROOT" runtime
@@ -93,13 +93,13 @@
 +    done
      cd "$BASEDIR"/runtime/objs
      echo $this: Compiling the run-time system.
--    $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
-+    echo "$MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS AS=\"$AS\" ASFLAGS=\"$ASFLAGS\" CFLAGS=\"$CFLAGS\" LDFLAGS=\"$LDFLAGS\""
-+    $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS AS="$AS" ASFLAGS="$ASFLAGS" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+-    $MAKE -f $RT_MAKEFILE $EXTRA_DEFS
++    echo "$MAKE -f $RT_MAKEFILE $EXTRA_DEFS AS=\"$AS\" ASFLAGS=\"$ASFLAGS\" CFLAGS=\"$CFLAGS\" LDFLAGS=\"$LDFLAGS\""
++    $MAKE -f $RT_MAKEFILE $EXTRA_DEFS AS="$AS" ASFLAGS="$ASFLAGS" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
      if [ -x run.$ARCH-$OPSYS ]; then
  	mv run.$ARCH-$OPSYS "$RUNDIR"
  	if [ -f runx.$ARCH-$OPSYS ]; then
-@@ -367,7 +423,7 @@ else
+@@ -394,7 +450,7 @@ else
  	if [ -f run.$ARCH-$OPSYS.a ]; then
  	    mv run.$ARCH-$OPSYS.a "$RUNDIR"
  	fi
@@ -108,7 +108,7 @@
      else
  	complain "$this: !!! Run-time system build failed for some reason."
      fi
-@@ -393,7 +449,7 @@ if [ -r "$HEAPDIR"/sml.$HEAP_SUFFIX ]; then
+@@ -420,7 +476,7 @@ if [ -r "$HEAPDIR"/sml.$HEAP_SUFFIX ]; then
  	complain "$this !!! Unable to re-create heap image (sml.$HEAP_SUFFIX)."
      fi
  else
@@ -117,7 +117,7 @@
  
      fish "$ROOT"/"$BOOT_FILES"/smlnj/basis
  
-@@ -428,7 +484,7 @@ else
+@@ -455,7 +511,7 @@ else
  	    cd "$ROOT"/"$BOOT_FILES"
  	    for anchor in * ; do
  		if [ -d $anchor ] ; then
@@ -126,7 +126,7 @@
  		    move $anchor "$LIBDIR"/$anchor
  		fi
  	    done
-@@ -451,6 +507,18 @@ installdriver _ml-build ml-build
+@@ -478,6 +534,18 @@ installdriver _ml-build ml-build
  
  cd "$ROOT"
  
@@ -145,7 +145,7 @@
  #
  # Now do all the rest using the precompiled installer
  # (see base/system/smlnj/installer for details)
-@@ -460,6 +528,12 @@ if [ $nolib = false ] ; then
+@@ -487,6 +555,12 @@ if [ $nolib = false ] ; then
      export ROOT INSTALLDIR CONFIGDIR BINDIR
      CM_TOLERATE_TOOL_FAILURES=true
      export CM_TOLERATE_TOOL_FAILURES
@@ -158,7 +158,7 @@
      if "$BINDIR"/sml -m \$smlnj/installer.cm
      then
  	vsay $this: Installation complete.
-@@ -467,5 +541,20 @@ if [ $nolib = false ] ; then
+@@ -494,5 +568,20 @@ if [ $nolib = false ] ; then
  	complain "$this: !!! Installation of libraries and programs failed."
      fi
  fi
diff --git a/lang/smlnj/pkg-plist b/lang/smlnj/pkg-plist
index eb8192c525e1..28afa9db6744 100644
--- a/lang/smlnj/pkg-plist
+++ b/lang/smlnj/pkg-plist
@@ -123,6 +123,7 @@ smlnj/lib/smlnj/.cm/%%MLARCH%%-unix/compiler.cm
 smlnj/lib/smlnj/.cm/%%MLARCH%%-unix/installer.cm
 smlnj/lib/smlnj/.cm/%%MLARCH%%-unix/library-install.cm
 smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/ALPHA.cm
+smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/AMD64.cm
 smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/Control.cm
 smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/Graphs.cm
 smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/HPPA.cm
@@ -137,6 +138,7 @@ smlnj/lib/smlnj/basis/.cm/%%MLARCH%%-unix/basis.cm
 smlnj/lib/smlnj/cm/.cm/%%MLARCH%%-unix/cm.cm
 smlnj/lib/smlnj/cm/.cm/%%MLARCH%%-unix/tools.cm
 smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/alpha32-unix.cm
+smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/amd64-unix.cm
 smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/current.cm
 smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/hppa-unix.cm
 smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/ppc-macos.cm
@@ -146,6 +148,7 @@ smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/x86-unix.cm
 smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/x86-win32.cm
 smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/all.cm
 smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/alpha32.cm
+smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/amd64.cm
 smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/compiler.cm
 smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/current.cm
 smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/hppa.cm
@@ -168,6 +171,7 @@ smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/html-lib.cm
 smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/pp-lib.cm
 smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/smlnj-lib.cm
 smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/alpha32.cm
+smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/amd64.cm
 smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/basics.cm
 smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/core.cm
 smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/debugprof.cm