Attachment #210067 for bug #242728

View | Details | Raw Unified | Return to bug 242728
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	smlnj
PORTVERSION=	110.96
CATEGORIES=	lang
MASTER_SITES=	http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ \
		ftp://mirror.free.de/http/smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/

LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

ONLY_FOR_ARCHS=	amd64 i386
LLD_UNSAFE=	yes

NO_WRKSUBDIR=	yes



.include <bsd.port.pre.mk>

.if (${ARCH} == "i386")
CFLAGS+=	-m32
AS?=		as
ASFLAGS+=	--32
.endif
CPPASFLAGS+=	-DGNU_ASSEMBLER
.if (${ARCH} == "i386" || ${ARCH} == "amd64")
MLARCH=		x86
MLSIZE=		32
PLIST_SUB+=	MLSIZE32=""
.elif  (${ARCH} == "amd64")
MLARCH=		amd64
MLSIZE=		64
PLIST_SUB+=	MLSIZE32="@comment "
.endif
PLIST_SUB+=	MLARCH=${MLARCH}
# -fPIC is required for building runtime.so
CFLAGS+=	-fPIC
AS=		${CC} -x assembler -c
ASFLAGS+=	-fPIC
DISTFILES+=	boot.${MLARCH}-unix.tgz
DISTFILES+=	MLRISC.tgz asdl.tgz ckit.tgz cml.tgz doc.tgz heap2asm.tgz \
		ml-burg.tgz ml-lex.tgz ml-lpt.tgz ml-yacc.tgz nlffi.tgz \
		old-basis.tgz smlnj-lib.tgz trace-debug-profile.tgz

PLIST_SUB+=	MLARCH=${MLARCH}

# Useful for tuning recompilation.
CMB_COMMAND=


.endfor
MLTARGETS=	heap2asm
MLEXE=		asdlgen heap2exec ml-antlr ml-build ml-burg ml-lex \
		ml-makedepend ml-ulex ml-yacc sml
.if ${MLSIZE} == 32
MLEXE+=		ml-nlffigen
.endif
.if ${PORT_OPTIONS:MEVERYTHING}
MLSTDSRCDIRS+=	eXene pgraph smlnj-c
MLTARGETS+=	eXene mlrisc-tools nowhere pgraph-util src-smlnj

	MLSTANDARDPATCHDIRS=`${MLSTANDARDPATCHDIRS_CMD}` \
	MLSOURCEPATCHES=`${MLSOURCEPATCHES_CMD}` \
	CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' \
	AS='${AS}' ASFLAGS='${ASFLAGS}' EXTRA_DEFS='${EXTRA_DEFS}' \
	./config/install.sh -default ${MLSIZE}
	./config/install.sh
.if ${PORT_OPTIONS:MRECOMPILE}
	-${RM} ${WRKSRC}/config/targets.customized
	@${ECHO} '(* Recompiling the core system: *)'

	${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \
	${ECHO_CMD} ${CMB_COMMAND} ; \
	${ECHO_CMD} 'CMB.make ();' ) | \
	../../bin/sml -${MLSIZE}
	@${ECHO} '(* Building the recompiled heap: *)'
	cd ${WRKSRC}/${RECOMPILEDIR} && \
	./makeml -${MLSIZE}
	@${ECHO} '(* Removing old libs and heaps: *)'
	cd ${WRKSRC}/${RECOMPILEDIR} && \
	${RM} -r ../../lib && ${MKDIR} ../../lib && \

	\! -name 'sml.${MLARCH}-bsd' -delete -print
	@${ECHO} '(* Installing the recompiled libs and heap: *)'
	cd ${WRKSRC}/${RECOMPILEDIR} && \
	./installml -${MLSIZE}
	@${ECHO} '(* Building requested targets: *)'
	cd ${WRKSRC} && unset PWD && \
	FILESDIR="${FILESDIR}" PATCH="${PATCH}" \

	PATCH_ARGS="-d ${PATCH_WRKSRC} ${PATCH_ARGS}" \
	MLNORUNTIMECLEAN=yes RECOMPILEDIR="${RECOMPILEDIR}" \
	CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' \
	AS='${AS}' ASFLAGS='${ASFLAGS}' EXTRA_DEFS='${EXTRA_DEFS}' \
	./config/install.sh -default ${MLSIZE}
	./config/install.sh
.endif

.if ${PORT_OPTIONS:MEVERYTHING}

	STAGEDIR="${STAGEDIR}" MLLIB="${MLLIB}" \
	INSTALLDIR="${STAGEDIR}${MLROOT}" \
	CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' \
	AS='${AS}' ASFLAGS='${ASFLAGS}' EXTRA_DEFS='${EXTRA_DEFS}' \
	./config/install.sh -default ${MLSIZE}
	./config/install.sh
.else
	@${ECHO} '(* Rebuilding the recompiled libs: *)'
	cd ${WRKSRC}/${RECOMPILEDIR} && ( \

	${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \
	${ECHO_CMD} ${CMB_COMMAND} ; \
	${ECHO_CMD} 'CMB.make ();' ) | \
	../../bin/sml -${MLSIZE}
	@${ECHO} '(* Rebuilding the recompiled heap: *)'
	cd ${WRKSRC}/${RECOMPILEDIR} && \
	./makeml -${MLSIZE}
	@${ECHO} '(* Installing into ${STAGEDIR}${MLROOT}: *)'
	cd ${WRKSRC} && unset PWD && \
	FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="-d ${PATCH_WRKSRC} ${PATCH_ARGS}" \

	STAGEDIR="${STAGEDIR}" MLLIB="${MLLIB}" \
	INSTALLDIR="${STAGEDIR}${MLROOT}" RECOMPILEDIR="${RECOMPILEDIR}" \
	CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' \
	AS='${AS}' ASFLAGS='${ASFLAGS}' EXTRA_DEFS='${EXTRA_DEFS}' \
	./config/install.sh -default ${MLSIZE}
	./config/install.sh
.endif
	@${ECHO} '(* Installing man pages. *)'
.for mansect in 1 2 3 4 5 6 7 8 9




TIMESTAMP = 1576341142
SHA256 (smlnj/110.96/MLRISC.tgz) = 193c29217e592d3e5a67cd0bde14ebfed2a2c3e4bcfae1e151e8fbe148fbe69e
SIZE (smlnj/110.96/MLRISC.tgz) = 1460365
SHA256 (smlnj/110.96/asdl.tgz) = 2a521d8ba66ba1f2fc1c4b315bd43567ece21969026ce45b6f50d9132726724e
SIZE (smlnj/110.96/asdl.tgz) = 205907
SHA256 (smlnj/110.96/boot.amd64-unix.tgz) = 605a118476d251bd77e312f303df3039adea6ace521d9ac140e2187b904ec807
SIZE (smlnj/110.96/boot.amd64-unix.tgz) = 6031590
SHA256 (smlnj/110.96/boot.x86-unix.tgz) = ab08f260137fb68492d747b96d5be8ce49e8eda55a358094fd9018efd32341bd
SIZE (smlnj/110.96/boot.x86-unix.tgz) = 6034356
SHA256 (smlnj/110.96/ckit.tgz) = 8b9301e3a2975be6877ce22edc27445630d57f51afbb77a950f386c9b3193bbf
SIZE (smlnj/110.96/ckit.tgz) = 201009
SHA256 (smlnj/110.96/cm.tgz) = 19e4f8096f5c8af64f20e57c5b48dacf9054c90ec14db4908a9e8c5bc505c568
SIZE (smlnj/110.96/cm.tgz) = 220256
SHA256 (smlnj/110.96/cml.tgz) = ec2b2d08343a32d911f30f34fb506fd0fed21b21378592e568107a68abc6ed8a
SIZE (smlnj/110.96/cml.tgz) = 105379
SHA256 (smlnj/110.96/compiler.tgz) = 1382181001e0cf8d751c3d1707331f305e1ab3e41ca07af1349a73ef16df4a4c
SIZE (smlnj/110.96/compiler.tgz) = 848920
SHA256 (smlnj/110.96/config.tgz) = b2bda33c1fb1472b4ca69827463b1b1b7b8a86bed72db959a558d9e4fe65de18
SIZE (smlnj/110.96/config.tgz) = 517305
SHA256 (smlnj/110.96/doc.tgz) = 24243d3a58b50973d151304f878bd2e80a6ce71cefced114cb694b89e039641a
SIZE (smlnj/110.96/doc.tgz) = 2134988
SHA256 (smlnj/110.96/eXene.tgz) = 0c5d642c57380b0a427d4ce9f6af84c2bb76859089b36a4f5da3a2149d7fb2bf
SIZE (smlnj/110.96/eXene.tgz) = 721127
SHA256 (smlnj/110.96/heap2asm.tgz) = 1cb94d9ba56c58cb122f7f9d548824e6a7fed155acd17ac4d10fb028ca7a4a50
SIZE (smlnj/110.96/heap2asm.tgz) = 1395
SHA256 (smlnj/110.96/ml-burg.tgz) = 4286a4aa01f2063bdbea10ab1c7299b7a41a4a822a96d4a040ce404b1b3276b1
SIZE (smlnj/110.96/ml-burg.tgz) = 40552
SHA256 (smlnj/110.96/ml-lex.tgz) = 02971b9026d2c6df8b425b8ac78c4065439a62e09b36fc974a98b5062874b8f0
SIZE (smlnj/110.96/ml-lex.tgz) = 27879
SHA256 (smlnj/110.96/ml-lpt.tgz) = 3736cd60daad7510467ee2f31462cffbb43890bc4499b3efc7d671829f68e141
SIZE (smlnj/110.96/ml-lpt.tgz) = 267441
SHA256 (smlnj/110.96/ml-yacc.tgz) = 3a8d4d345ec3832b30bde1a7b0c0f97f209f40afd80e6ff6e1c78f365a77b0e9
SIZE (smlnj/110.96/ml-yacc.tgz) = 101727
SHA256 (smlnj/110.96/nlffi.tgz) = fb08f68da401382396fe0cb676b0f81eda27e9360c69fbeb3d473dec3452e8ee
SIZE (smlnj/110.96/nlffi.tgz) = 75084
SHA256 (smlnj/110.96/old-basis.tgz) = c3fea6a6b14d3c4cfad92944bd259f6b104a76f4b7ee8dd999275dcab8336199
SIZE (smlnj/110.96/old-basis.tgz) = 1215
SHA256 (smlnj/110.96/pgraph.tgz) = 73f0a34fc2ac5ec9ba1aa10bb732300b0aea0a63d32154c108ce42b28d1d72a6
SIZE (smlnj/110.96/pgraph.tgz) = 5430
SHA256 (smlnj/110.96/runtime.tgz) = 46ab1f6f4282ab46f117f8b8673e70180b8b4cbc6d9afdfa305aa8510258bf69
SIZE (smlnj/110.96/runtime.tgz) = 336178
SHA256 (smlnj/110.96/smlnj-c.tgz) = 3c1064ba53990abf278ebe80f68b62dad14d9f6a044ac72c6f2cf602c6aaa28c
SIZE (smlnj/110.96/smlnj-c.tgz) = 10620
SHA256 (smlnj/110.96/smlnj-lib.tgz) = 7ff7e8008bc08f32f2080e83afa7c609171d9856ec46fcccaec7f44c309057fb
SIZE (smlnj/110.96/smlnj-lib.tgz) = 457923
SHA256 (smlnj/110.96/system.tgz) = 8f33d350c4027e326f4b910cba2c50ae215a0b6ce93fed380b02f48c19ce3161
SIZE (smlnj/110.96/system.tgz) = 274076
SHA256 (smlnj/110.96/trace-debug-profile.tgz) = 5f24d0ae00fb8dde2cec660ca66395fcfcc417ee56faec7f5f420af18cabb80d
SIZE (smlnj/110.96/trace-debug-profile.tgz) = 3935

Line 0 Link Here

(-)files/do-patch-asdl_config_check__smlnj__heap__suffix.m4 (+10 lines)
	1	--- asdl/config/check_smlnj_heap_suffix.m4.orig 2019-10-21 18:02:45 UTC
	2	+++ asdl/config/check_smlnj_heap_suffix.m4
	3	@@ -45,6 +45,7 @@ AC_DEFUN([CHECK_SMLNJ_HEAP_SUFFIX], [
	4	sparc:solaris3*) SMLNJ_ARCH=sparc; SMLNJ_OPSYS=solaris;;
	5	x86_64:linux*) SMLNJ_ARCH=x86_64; SMLNJ_OPSYS=linux;;
	6	x86_64:darwin*) SMLNJ_ARCH=x86_64; SMLNJ_OPSYS=darwin;;
	7	+ x86_64:freebsd*) SMLNJ_ARCH=x86_64; SMLNJ_OPSYS=freebsd;;
	8	*) $1 ;;
	9	esac
	10	if test z$SMLNJ_ARCH != z -a z$SMLNJ_OPSYS != z ; then

Lines 1-10 Link Here

(-)files/do-patch-asdl_configure (-10 lines)
1	--- asdl/configure.orig 2019-06-20 16:01:17 UTC
2	+++ asdl/configure
3	@@ -4893,6 +4893,7 @@ $as_echo "$SMLNJ_VERSION" >&6; }
4	sparc:solaris2*) SMLNJ_ARCH=sparc; SMLNJ_OPSYS=sunos;;
5	sparc:solaris3*) SMLNJ_ARCH=sparc; SMLNJ_OPSYS=solaris;;
6	x86_64:linux*) SMLNJ_ARCH=x86; SMLNJ_OPSYS=linux;;
7	+ x86_64:freebsd*) SMLNJ_ARCH=x86; SMLNJ_OPSYS=freebsd;;
8	x86_64:darwin*) SMLNJ_ARCH=x86; SMLNJ_OPSYS=darwin;;
9	*)
10	as_fn_error $? "unsupported configuration ${host_cpu}-${host_os}" "$LINENO" 5 ;;




--- asdl/src/asdlgen/Makefile.in.orig	2019-10-21 18:02:45 UTC
+++ asdl/src/asdlgen/Makefile.in
@@ -35,10 +35,11 @@ INSTALL_WRAPPER =	@ASDL_ROOT@/bin/install-sml-wrapper.
 
 # if specified, include the size option as an argument to ml-build
 #
-ifneq (@HOSTSIZE@,)
+#ifneq (@HOSTSIZE@,)
+.if defined(@HOSTSIZE@)
 ML_BUILD_FLAGS +=	-@HOSTSIZE@
 ML_MAKEDEPEND_FLAGS +=	-@HOSTSIZE@
-endif
+.endif
 
 #
 # generator tools
@@ -62,8 +63,10 @@ CM_FILES =		back-end/sml/sources.cm \
 
 CODE_FRAG_DIRS =	back-end/sml
 
-CODE_FRAG_FILES =	$(patsubst %,%/fragments.sml,$(CODE_FRAG_DIRS))

 
 SRCDIR =		@ASDLGEN_SRCDIR@
 
@@ -102,14 +105,18 @@ back-end/sml/fragments.sml:
 	touch .depend
 	$(ML_MAKEDEPEND) $(ML_MAKEDEPEND_FLAGS) -n -f .depend $(ROOT_CM) $(HEAP) || rm -f .depend
 




--- base/runtime/include/ml-unixdep.h.orig	2019-11-14 19:24:04 UTC
+++ base/runtime/include/ml-unixdep.h
@@ -33,9 +33,10 @@
  *   HAS_UCONTEXT		if signal handlers have a ucontext_t argument.
  *   HAS_STRERROR		if the system provides the ISO C strerror function.
  *   INT_GIDLIST		if the second argument to getgroups is int[].
+ *   HAS_MKSTEMP		if OS provides the POSIX mkstemp function.
  *   STAT_HAS_TIMESPEC		if the time fields in the "struct stat" type have
  *				type "struct timespec".
- *   HAS_NANOSLEEP              if the system provides the nanosleep(2) function.
+ *   HAS_NANOSLEEP		if the system provides the nanosleep(2) function.
  *
  * Note that only one of the following sets of symbols should be defined:
  *   { HAS_MMAP, HAS_ANON_MMAP, HAS_VM_ALLOCATE }
@@ -208,8 +209,11 @@ extern char	*sys_errlist[];
 #  define HAS_SELECT
 #  define HAS_UCONTEXT
 #  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_NANOSLEEP
+/* FreeBSD uses MAP_ANON for MAP_ANONYMOUS */
+#  define MAP_ANONYMOUS MAP_ANON
 
 #elif defined(OPSYS_NETBSD) /* version 3.x */
 #  define OS_NAME	"BSD"
@@ -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>
+#    include INCLUDE_FREEBSD_I386__TYPES
+#  endif
+#  if defined(INCLUDE_FREEBSD_I386_SIGNAL)
+#    include INCLUDE_FREEBSD_I386_SIGNAL
+#  endif
 #endif
 
 #include <unistd.h>




--- base/runtime/objs/makefile.orig	2019-11-10 14:00:54 UTC
+++ base/runtime/objs/makefile
@@ -5,10 +5,12 @@
 

 MAKE =		make
-CC =		cc
-CPP =		/lib/cpp
-LD_LIBS =
-AS =		as
+CC ?=		cc
+CFLAGS ?=
+CPP ?=		/lib/cpp
+LD_LIBS ?=
-AS =		as
+AS ?=		as
+ASFLAGS ?=
+CPPASFLAGS ?=
 AR =		ar
 ARFLAGS =	rcv
 RANLIB =	ranlib
@@ -37,8 +39,6 @@ MP_DIR =	$(ROOT_DIR)/mp
 CLIB_DIR =	$(ROOT_DIR)/c-libs
 CONFIG_DIR =	$(ROOT_DIR)/config
 
-CFLAGS =	-O
-
 
 INCLUDES =	-I$(OBJS_DIR) -I$(INC_DIR)
 GC_INCLUDES =	$(INCLUDES) -I$(GC_DIR)
 GEN_INCLUDES =	-I$(CONFIG_DIR) $(INCLUDES)
@@ -275,7 +275,7 @@ prim.o:		$(MACH_DIR)/$(TARGET).prim.asm \
 		$(MACH_DIR)/x86-syntax.h \
 		mlstate-offsets.h
 	$(CPP) -D_ASM_ $(DEFS) $(INCLUDES) $(MACH_DIR)/$(TARGET).prim.asm > prim.s
-	$(AS) -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
 
@@ -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
-	$(AS) -o primops.o primops.s
+	$(AS) $(ASFLAGS) -o primops.o primops.s
 
 bc-instr-def.h:	gen-bc-instr-def \
 		$(BC_DIR)/bc.h $(BC_DIR)/print-bc.h
@@ -330,7 +332,7 @@ bc-instr-def.h:	gen-bc-instr-def \
 #
 MK_ARGS =		VERSION="$(VERSION)" \
 			MAKE="$(MAKE)" \
-			CC="$(CC)" CFLAGS="$(CFLAGS)" DEFS="$(DEFS)" \
+			CC="$(CC)" CFLAGS="$(CFLAGS)" DEFS='$(DEFS)' \
 			AR="$(AR)" ARFLAGS="$(ARFLAGS)" \
 			RANLIB="$(RANLIB)" \
 			INCLUDES="$(GC_INCLUDES) -I../bytecode"
@@ -421,7 +423,7 @@ LIB_INCLUDES =	-I$(LIB_OBJS_DIR) -I$(LIB_INC_DIR) -I..
 #
 LIB_MK_ARGS =		VERSION="$(VERSION)" \
 			MAKE="$(MAKE)" \
-			CC="$(CC)" CFLAGS="$(CFLAGS)" DEFS="$(DEFS)" \
+			CC="$(CC)" CFLAGS="$(CFLAGS)" DEFS='$(DEFS)' \
 			AR="$(AR)" ARFLAGS="$(ARFLAGS)" \
 			RANLIB="$(RANLIB)" \
 			INCLUDES="$(LIB_INCLUDES)"




--- base/runtime/objs/mk.amd64-freebsd.orig	2019-11-14 19:33:11 UTC
+++ base/runtime/objs/mk.amd64-freebsd
@@ -1,4 +1,4 @@
-# mk.amd64-freebst
+# mk.amd64-freebsd
 #
 # makefile for "Free BSD" on the amd64 architecture, which is a BSD 4.4 clone.
 #
@@ -6,9 +6,10 @@
 SHELL =		/bin/sh
 
 MAKE =		make
-AS =		as --64
-CC =		cc -std=gnu99
-CFLAGS =	-O2 -m64
+AS ?=		cc -x assembler -c
+ASFLAGS ?=	-fPIC
+CC ?=		cc -std=gnu99
+CFLAGS ?=	-O2 -m64 -fPIC
 CPP =		cc -x assembler-with-cpp -E -P
 XOBJS =
 XLIBS =		../c-libs/dl/libunix-dynload.a
@@ -26,6 +27,6 @@ RUNTIME_SO =	run.amd64-freebsd.so
 RUNTIME_A =	run.amd64-freebsd.a
 
 all:
-	($(MAKE) CHECK_HEAP=$(CHECK_HEAP) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
-#	($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared" $(RUNTIME_SO))
-#	($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))
+	($(MAKE) CHECK_HEAP=$(CHECK_HEAP) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
+	($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared -Wl,-z,notext" $(RUNTIME_SO))
+	($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))




--- base/runtime/objs/mk.x86-freebsd.orig	2019-11-14 19:19:39 UTC
+++ base/runtime/objs/mk.x86-freebsd
@@ -6,20 +6,20 @@
 
 SHELL =		/bin/sh
 
 MAKE =		make
-
-AS =		as --32
-CC =		cc -std=gnu99
-CFLAGS =	-O2 -m32
+AS ?=		cc -x assembler -c
+ASFLAGS ?=	-fPIC
+CC ?=		cc -std=gnu99
+CFLAGS ?=	-O2 -m32 -fPIC
 CPP =		cc -x assembler-with-cpp -E -P
-#CPP =		/usr/bin/cpp -P
-ARFLAGS =	Trcv
-
 XOBJS =
 XLIBS =		../c-libs/dl/libunix-dynload.a
-LD_LIBS =
+LD_LIBS =	-ldl
+#CHECK_HEAP =	check-heap.o
+XDEFS =		-DASSERT_ON
 BASE_DEFS =
-DEFS =		$(BASE_DEFS) -DARCH_X86 -DDSIZE_32 -DOPSYS_UNIX -DOPSYS_FREEBSD \
-		-DGNU_ASSEMBLER -DDLOPEN -DINDIRECT_CFUNC
+DEFS =		$(XDEFS) $(BASE_DEFS) -DARCH_X86 -DSIZE_32 \
+		-DOPSYS_UNIX -DOPSYS_FREEBSD -D_GNU_SOURCE -DGNU_ASSEMBLER -DDLOPEN \
+		-DINDIRECT_CFUNC
 TARGET =	X86
 VERSION =	v-x86-freebsd
 RUNTIME =	run.x86-freebsd
@@ -27,6 +27,6 @@ RUNTIME_SO =	run.x86-freebsd.so
 RUNTIME_A =	run.x86-freebsd.a
 
 all:
-	($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
-#	($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared" $(RUNTIME_SO))
-#	($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))
+	($(MAKE) CHECK_HEAP=$(CHECK_HEAP) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
+	($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared -Wl,-z,notext" $(RUNTIME_SO))
+	($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))

Line 0 Link Here

(-)files/do-patch-base_system_Basis_Implementation_date.sml (+11 lines)
	1	--- base/system/Basis/Implementation/date.sml.orig 2019-06-12 21:16:48 UTC
	2	+++ base/system/Basis/Implementation/date.sml
	3	@@ -70,7 +70,7 @@ structure Date : DATE =
	4	= wrap (CInterface.c_function "SMLNJ-Date" "strfTime")
	5
	6	(* conversions between integer numbers of seconds (used by runtime) and Time.time values *)
	7	- fun nsToTime s = Time.fromSeconds (Word64.toLargeInt s)
	8	+ fun nsToTime s = Time.fromNanoseconds (Word64.toLargeInt s)
	9	fun timeToNs t = Word64.fromLargeInt (Time.toNanoseconds t)
	10
	11	val localTime = localTime' o timeToNs

Lines 1-11 Link Here

(-)files/do-patch-eXene_lib_protocol_xreply.sml (-11 lines)
1	--- eXene/lib/protocol/xreply.sml.orig 2006-03-03 03:33:16 UTC
2	+++ eXene/lib/protocol/xreply.sml
3	@@ -51,7 +51,7 @@ structure XReply =
4	fun get32 (s, i) = Word32.fromLargeWord(PackWord32Big.subVec(s, i div 4))
5	fun getSigned32 (s, i) =
6	Int32.fromLarge(LargeWord.toLargeInt(PackWord32Big.subVecX(s, i div 4)))
7	- fun getWord (s, i) = Word.fromLargeWord(get32(s, i))
8	+ fun getWord (s, i) = Word.fromLargeWord(PackWord32Big.subVec(s, i div 4))
9	fun getInt (s, i) = LargeWord.toIntX(PackWord32Big.subVecX(s, i div 4))
10
11	val w8vextract = Word8VectorSlice.vector o Word8VectorSlice.slice

Lines 1-11 Link Here

(-)files/do-patch-eXene_lib_protocol_xrequest.sml (-11 lines)
1	--- eXene/lib/protocol/xrequest.sml.orig 2005-11-07 23:03:18 UTC
2	+++ eXene/lib/protocol/xrequest.sml
3	@@ -84,7 +84,7 @@ structure XRequest =
4	putSigned16(buf, i+8, border))
5
6	fun putTS (buf, i, XTy.CurrentTime) = put32(buf, i, 0w0)
7	- \| putTS (buf, i, XTy.TimeStamp(XTime.XT t)) = put32(buf, i, t)
8	+ \| putTS (buf, i, XTy.TimeStamp(XTime.XT t)) = put32(buf, i, Word32.toLarge t)
9
10	fun putRGB (buf, i, XTy.RGB{red, green, blue}) = (
11	putWord16(buf, i, red);

Lines 1-11 Link Here

(-)files/do-patch-eXene_lib_protocol_xsendevt.sml (-11 lines)
1	--- eXene/lib/protocol/xsendevt.sml.orig 2005-11-02 22:24:39 UTC
2	+++ eXene/lib/protocol/xsendevt.sml
3	@@ -46,7 +46,7 @@ structure XSendEvent =
4	\| putAtomOption (buf, i, SOME(XTy.XAtom n)) = putWord32 (buf, i, n)
5
6	fun putTS (buf, i, XTy.CurrentTime) = put32(buf, i, 0w0)
7	- \| putTS (buf, i, XTy.TimeStamp(XTime.XT t)) = put32(buf, i, t)
8	+ \| putTS (buf, i, XTy.TimeStamp(XTime.XT t)) = put32(buf, i, Word32.toLarge t)
9
10	(* event codes *)
11	val evtKeyPressXEvt = 0w2 : Word8.word

Lines 1-11 Link Here

(-)files/patch-config___arch-n-opsys (-11 lines)
1	--- config/_arch-n-opsys.orig 2019-05-31 12:15:03 UTC
2	+++ config/_arch-n-opsys
3	@@ -97,6 +97,8 @@ case `uname -s` in
4	HEAP_OPSYS=bsd
5	case `uname -m` in
6	*86) ARCH=x86;;
7	+ # Fall back to x86 compatibility mode.
8	+ amd64) ARCH=x86;;
9	*) exit 1;;
10	esac
11	;;




--- config/_heap2exec.orig	2019-05-31 12:36:14 UTC
+++ config/_heap2exec
@@ -89,6 +89,7 @@ SO_LIBS=
 A_PROG=
 A_FLAGS=
 A_LIBS=
+AS_FLAGS=
 
 case ${OPSYS} in
 	darwin)
@@ -102,6 +103,13 @@ case ${OPSYS} in
 		A_PROG=${CC}
 		A_FLAGS=-Wl,--export-dynamic
 		A_LIBS=-lm
+		case `uname -m` in
+			amd64)
+				SO_FLAGS="${SO_FLAGS} -m32"
+				A_FLAGS="${A_FLAGS} -m32"
+				AS_FLAGS="${AS_FLAGS} -m32"
+				;;
+		esac
 		;;
 	linux)
 		SO_PROG=${CC}
@@ -122,7 +130,7 @@ fi
 RESULT=0
 if ${H2A} "$heapfile" "$execfile".s ; then
 	if [ -f "$execfile".s ] ; then
-		if ${CC} -c -o "$execfile".o "$execfile".s ; then
+		if ${CC} -c ${AS_FLAGS} -o "$execfile".o "$execfile".s ; then
 			rm "$execfile".s
 		else
 			rm "$execfile".s




--- config/install.sh.orig	2019-11-23 16:06:59 UTC
+++ config/install.sh
@@ -56,11 +56,36 @@ if [ x"$SIZE_OPT" = x ] ; then
     SIZE_OPT="-"$DEFAULT_SIZE
 fi
 
+[ -n "$RECOMPILEDIR" ] && echo "RECOMPILEDIR=$RECOMPILEDIR"

 if [ x${INSTALL_QUIETLY} = xtrue ] ; then
     export CM_VERBOSE
     CM_VERBOSE=false
 fi
     exit 1
 }
 
+#
+# do_patch patch-file
+# apply a patch file
+#
+do_patch() {
+	patchfile=$FILESDIR/$1
+

+	fi
+}
+
 vsay() {
     if [ x${INSTALL_DEBUG} = xtrue ] ; then
 	echo "$@"
@@ -128,7 +153,28 @@ trap 'cd "$ROOT"; rm -f $tmpfiles' 0 1 2 3 15
 # Especially important is CM_PATHCONFIG.
 #
 export CM_PATHCONFIG

 #
 # the release version that we are installing
 #
@@ -403,7 +449,12 @@ esac
 # the name of the bin files directory
 #
 BOOT_ARCHIVE=boot.$ARCH-unix

 
 #
 # build the run-time system
@@ -412,9 +463,15 @@ if [ -x "$RUNDIR"/run.$ARCH-$OPSYS ]; then
     vsay $this: Run-time system already exists.
 else
     "$CONFIGDIR"/unpack "$ROOT" runtime

     if [ -x run.$ARCH-$OPSYS ]; then
 	mv run.$ARCH-$OPSYS "$RUNDIR"
 	if [ -f runx.$ARCH-$OPSYS ]; then
@@ -426,7 +483,7 @@ else
 	if [ -f run.$ARCH-$OPSYS.a ]; then
 	    mv run.$ARCH-$OPSYS.a "$RUNDIR"
 	fi

     else
 	complain "$this: !!! Run-time system build failed for some reason."
     fi
@@ -452,7 +509,7 @@ if [ -r "$HEAPDIR"/sml.$HEAP_SUFFIX ]; then
 	complain "$this !!! Unable to re-create heap image (sml.$HEAP_SUFFIX)."
     fi
 else

 
     fish "$ROOT"/"$BOOT_FILES"/smlnj/basis
 
@@ -487,7 +544,7 @@ else
 	    cd "$ROOT"/"$BOOT_FILES"
 	    for anchor in * ; do
 		if [ -d $anchor ] ; then

 		    move $anchor "$LIBDIR"/$anchor
 		fi
 	    done
@@ -510,6 +567,18 @@ installdriver _ml-build ml-build
 
 cd "$ROOT"
 

 #
 # Now do all the rest using the precompiled installer
 # (see base/system/smlnj/installer for details)
@@ -519,6 +588,12 @@ if [ $nolib = false ] ; then
     export ROOT INSTALLDIR CONFIGDIR BINDIR
     CM_TOLERATE_TOOL_FAILURES=true
     export CM_TOLERATE_TOOL_FAILURES

+    # propagated to the resulting heaps because the heaps generated
+    # in this stage don't contain the compiler.
+    [ -z "$STAGEDIR" ] || CM_PATHCONFIG=$CM_LOCAL_PATHCONFIG
     if "$BINDIR"/sml $SIZE_OPT -m \$smlnj/installer.cm
     then
 	vsay $this: Installation complete.
@@ -526,5 +601,20 @@ if [ $nolib = false ] ; then
 	complain "$this: !!! Installation of libraries and programs failed."
     fi
 fi

Lines 1-4 Link Here

(-)files/patch-config_unpack (-1 / +1 lines)
1	--- config/unpack.orig 2016-08-04 14:38:24 UTC	1	--- config/unpack.orig 2019-10-28 14:53:16 UTC
2	+++ config/unpack	2	+++ config/unpack
3	@@ -291,6 +291,9 @@ do	3	@@ -291,6 +291,9 @@ do
4	# cd $ROOT/doc	4	# cd $ROOT/doc




smlnj/bin/.heap/ml-antlr.%%MLARCH%%-bsd
smlnj/bin/.heap/ml-burg.%%MLARCH%%-bsd
smlnj/bin/.heap/ml-lex.%%MLARCH%%-bsd
%%MLSIZE32%%smlnj/bin/.heap/ml-nlffigen.%%MLARCH%%-bsd
smlnj/bin/.heap/ml-ulex.%%MLARCH%%-bsd
smlnj/bin/.heap/ml-yacc.%%MLARCH%%-bsd
%%EVERYTHING%%smlnj/bin/.heap/nowhere.%%MLARCH%%-bsd

smlnj/bin/ml-burg
smlnj/bin/ml-lex
smlnj/bin/ml-makedepend
%%MLSIZE32%%smlnj/bin/ml-nlffigen
smlnj/bin/ml-ulex
smlnj/bin/ml-yacc
%%EVERYTHING%%smlnj/bin/nowhere

smlnj/lib/SMLNJ-LIB/PP/.cm/%%MLARCH%%-unix/pp-lib.cm
smlnj/lib/SMLNJ-LIB/Util/.cm/%%MLARCH%%-unix/smlnj-lib.cm
smlnj/lib/SMLNJ-ML-YACC-LIB/.cm/%%MLARCH%%-unix/ml-yacc-lib.cm
smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/ALPHA.cm
smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/AMD64-Peephole.cm
smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/AMD64.cm
smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall-Vararg.cm

smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall.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
smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/IA32-Peephole.cm
smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/IA32.cm
smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Lib.cm

smlnj/lib/asdl-lib.cm/.cm/%%MLARCH%%-unix/asdl-lib.cm
smlnj/lib/asdlgen-tool.cm/.cm/%%MLARCH%%-unix/asdlgen-tool.cm
smlnj/lib/burg-ext.cm/.cm/%%MLARCH%%-unix/burg-ext.cm
%%MLSIZE32%%smlnj/lib/c/.cm/%%MLARCH%%-unix/c.cm
%%MLSIZE32%%smlnj/lib/c/internals/.cm/%%MLARCH%%-unix/c-int.cm
%%MLSIZE32%%smlnj/lib/c/memory/.cm/%%MLARCH%%-unix/memory.cm
smlnj/lib/ckit-lib.cm/.cm/%%MLARCH%%-unix/ckit-lib.cm
smlnj/lib/cml/.cm/%%MLARCH%%-unix/basis.cm
smlnj/lib/cml/.cm/%%MLARCH%%-unix/cml-internal.cm

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
smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/IA32.cm
smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/Lib.cm
smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/MLRISC.cm

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
smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/ppc-unix.cm
smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/sparc-unix.cm
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
smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/minimal-only.cm
smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/minimal.cm
smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/ppc.cm

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/elabdata.cm
smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/elaborate.cm
smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/execute.cm
smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/hppa.cm
smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/parser.cm
smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/ppc.cm
smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/sparc.cm

Return to bug 242728

Lines 1-7 Link Here

(-)Makefile (-30 / +31 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= smlnj	3	PORTNAME= smlnj
4	PORTVERSION= 110.91	4	PORTVERSION= 110.96
5	CATEGORIES= lang	5	CATEGORIES= lang
6	MASTER_SITES= http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ \	6	MASTER_SITES= http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ \
7	ftp://mirror.free.de/http/smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/	7	ftp://mirror.free.de/http/smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/
Lines 19-25 Link Here
19	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	19	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
20		20
21	ONLY_FOR_ARCHS= amd64 i386	21	ONLY_FOR_ARCHS= amd64 i386
22	LLD_UNSAFE= yes
23		22
24	NO_WRKSUBDIR= yes	23	NO_WRKSUBDIR= yes
25		24
Lines 34-55 Link Here
34		33
35	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
36		35
37	.if (${ARCH} == "amd64")	36	.if (${ARCH} == "i386")
38	CFLAGS+= -m32
39	AS?= as
40	ASFLAGS+= --32
41	.endif
42	CPPASFLAGS+= -DGNU_ASSEMBLER
43	.if (${ARCH} == "i386" \|\| ${ARCH} == "amd64")
44	MLARCH= x86	37	MLARCH= x86
45	DISTFILES+= boot.x86-unix.tgz	38	MLSIZE= 32
		39	PLIST_SUB+= MLSIZE32=""
		40	.elif (${ARCH} == "amd64")
		41	MLARCH= amd64
		42	MLSIZE= 64
		43	PLIST_SUB+= MLSIZE32="@comment "
46	.endif	44	.endif
		45	PLIST_SUB+= MLARCH=${MLARCH}
		46	# -fPIC is required for building runtime.so
		47	CFLAGS+= -fPIC
		48	AS= ${CC} -x assembler -c
		49	ASFLAGS+= -fPIC
		50	DISTFILES+= boot.${MLARCH}-unix.tgz
47	DISTFILES+= MLRISC.tgz asdl.tgz ckit.tgz cml.tgz doc.tgz heap2asm.tgz \	51	DISTFILES+= MLRISC.tgz asdl.tgz ckit.tgz cml.tgz doc.tgz heap2asm.tgz \
48	ml-burg.tgz ml-lex.tgz ml-lpt.tgz ml-yacc.tgz nlffi.tgz \	52	ml-burg.tgz ml-lex.tgz ml-lpt.tgz ml-yacc.tgz nlffi.tgz \
49	old-basis.tgz smlnj-lib.tgz trace-debug-profile.tgz	53	old-basis.tgz smlnj-lib.tgz trace-debug-profile.tgz
50		54
51	PLIST_SUB+= MLARCH=${MLARCH}
52
53	# Useful for tuning recompilation.	55	# Useful for tuning recompilation.
54	CMB_COMMAND=	56	CMB_COMMAND=
55		57
Lines 76-82 Link Here
76	.endfor	78	.endfor
77	MLTARGETS= heap2asm	79	MLTARGETS= heap2asm
78	MLEXE= asdlgen heap2exec ml-antlr ml-build ml-burg ml-lex \	80	MLEXE= asdlgen heap2exec ml-antlr ml-build ml-burg ml-lex \
79	ml-makedepend ml-nlffigen ml-ulex ml-yacc sml	81	ml-makedepend ml-ulex ml-yacc sml
		82	.if ${MLSIZE} == 32
		83	MLEXE+= ml-nlffigen
		84	.endif
80	.if ${PORT_OPTIONS:MEVERYTHING}	85	.if ${PORT_OPTIONS:MEVERYTHING}
81	MLSTDSRCDIRS+= eXene pgraph smlnj-c	86	MLSTDSRCDIRS+= eXene pgraph smlnj-c
82	MLTARGETS+= eXene mlrisc-tools nowhere pgraph-util src-smlnj	87	MLTARGETS+= eXene mlrisc-tools nowhere pgraph-util src-smlnj
Lines 170-178 Link Here
170	MLSTANDARDPATCHDIRS=`${MLSTANDARDPATCHDIRS_CMD}` \	175	MLSTANDARDPATCHDIRS=`${MLSTANDARDPATCHDIRS_CMD}` \
171	MLSOURCEPATCHES=`${MLSOURCEPATCHES_CMD}` \	176	MLSOURCEPATCHES=`${MLSOURCEPATCHES_CMD}` \
172	CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' \	177	CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' \
173	AS='${AS}' ASFLAGS='${ASFLAGS}' CPPASFLAGS='${CPPASFLAGS}' \	178	AS='${AS}' ASFLAGS='${ASFLAGS}' EXTRA_DEFS='${EXTRA_DEFS}' \
174	EXTRA_DEFS='${EXTRA_DEFS}' \	179	./config/install.sh -default ${MLSIZE}
175	./config/install.sh
176	.if ${PORT_OPTIONS:MRECOMPILE}	180	.if ${PORT_OPTIONS:MRECOMPILE}
177	-${RM} ${WRKSRC}/config/targets.customized	181	-${RM} ${WRKSRC}/config/targets.customized
178	@${ECHO} '(* Recompiling the core system: *)'	182	@${ECHO} '(* Recompiling the core system: *)'
Lines 180-189 Link Here
180	${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \	184	${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \
181	${ECHO_CMD} ${CMB_COMMAND} ; \	185	${ECHO_CMD} ${CMB_COMMAND} ; \
182	${ECHO_CMD} 'CMB.make ();' ) \| \	186	${ECHO_CMD} 'CMB.make ();' ) \| \
183	../../bin/sml	187	../../bin/sml -${MLSIZE}
184	@${ECHO} '(* Building the recompiled heap: *)'	188	@${ECHO} '(* Building the recompiled heap: *)'
185	cd ${WRKSRC}/${RECOMPILEDIR} && \	189	cd ${WRKSRC}/${RECOMPILEDIR} && \
186	./makeml	190	./makeml -${MLSIZE}
187	@${ECHO} '(* Removing old libs and heaps: *)'	191	@${ECHO} '(* Removing old libs and heaps: *)'
188	cd ${WRKSRC}/${RECOMPILEDIR} && \	192	cd ${WRKSRC}/${RECOMPILEDIR} && \
189	${RM} -r ../../lib && ${MKDIR} ../../lib && \	193	${RM} -r ../../lib && ${MKDIR} ../../lib && \
Lines 191-197 Link Here
191	\! -name 'sml.${MLARCH}-bsd' -delete -print	195	\! -name 'sml.${MLARCH}-bsd' -delete -print
192	@${ECHO} '(* Installing the recompiled libs and heap: *)'	196	@${ECHO} '(* Installing the recompiled libs and heap: *)'
193	cd ${WRKSRC}/${RECOMPILEDIR} && \	197	cd ${WRKSRC}/${RECOMPILEDIR} && \
194	./installml	198	./installml -${MLSIZE}
195	@${ECHO} '(* Building requested targets: *)'	199	@${ECHO} '(* Building requested targets: *)'
196	cd ${WRKSRC} && unset PWD && \	200	cd ${WRKSRC} && unset PWD && \
197	FILESDIR="${FILESDIR}" PATCH="${PATCH}" \	201	FILESDIR="${FILESDIR}" PATCH="${PATCH}" \
Lines 198-206 Link Here
198	PATCH_ARGS="-d ${PATCH_WRKSRC} ${PATCH_ARGS}" \	202	PATCH_ARGS="-d ${PATCH_WRKSRC} ${PATCH_ARGS}" \
199	MLNORUNTIMECLEAN=yes RECOMPILEDIR="${RECOMPILEDIR}" \	203	MLNORUNTIMECLEAN=yes RECOMPILEDIR="${RECOMPILEDIR}" \
200	CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' \	204	CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' \
201	AS='${AS}' ASFLAGS='${ASFLAGS}' CPPASFLAGS='${CPPASFLAGS}' \	205	AS='${AS}' ASFLAGS='${ASFLAGS}' EXTRA_DEFS='${EXTRA_DEFS}' \
202	EXTRA_DEFS='${EXTRA_DEFS}' \	206	./config/install.sh -default ${MLSIZE}
203	./config/install.sh
204	.endif	207	.endif
205		208
206	.if ${PORT_OPTIONS:MEVERYTHING}	209	.if ${PORT_OPTIONS:MEVERYTHING}
Lines 297-305 Link Here
297	STAGEDIR="${STAGEDIR}" MLLIB="${MLLIB}" \	300	STAGEDIR="${STAGEDIR}" MLLIB="${MLLIB}" \
298	INSTALLDIR="${STAGEDIR}${MLROOT}" \	301	INSTALLDIR="${STAGEDIR}${MLROOT}" \
299	CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' \	302	CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' \
300	AS='${AS}' ASFLAGS='${ASFLAGS}' CPPASFLAGS='${CPPASFLAGS}' \	303	AS='${AS}' ASFLAGS='${ASFLAGS}' EXTRA_DEFS='${EXTRA_DEFS}' \
301	EXTRA_DEFS='${EXTRA_DEFS}' \	304	./config/install.sh -default ${MLSIZE}
302	./config/install.sh
303	.else	305	.else
304	@${ECHO} '(* Rebuilding the recompiled libs: *)'	306	@${ECHO} '(* Rebuilding the recompiled libs: *)'
305	cd ${WRKSRC}/${RECOMPILEDIR} && ( \	307	cd ${WRKSRC}/${RECOMPILEDIR} && ( \
Lines 306-315 Link Here
306	${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \	308	${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \
307	${ECHO_CMD} ${CMB_COMMAND} ; \	309	${ECHO_CMD} ${CMB_COMMAND} ; \
308	${ECHO_CMD} 'CMB.make ();' ) \| \	310	${ECHO_CMD} 'CMB.make ();' ) \| \
309	../../bin/sml	311	../../bin/sml -${MLSIZE}
310	@${ECHO} '(* Rebuilding the recompiled heap: *)'	312	@${ECHO} '(* Rebuilding the recompiled heap: *)'
311	cd ${WRKSRC}/${RECOMPILEDIR} && \	313	cd ${WRKSRC}/${RECOMPILEDIR} && \
312	./makeml	314	./makeml -${MLSIZE}
313	@${ECHO} '(* Installing into ${STAGEDIR}${MLROOT}: *)'	315	@${ECHO} '(* Installing into ${STAGEDIR}${MLROOT}: *)'
314	cd ${WRKSRC} && unset PWD && \	316	cd ${WRKSRC} && unset PWD && \
315	FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="-d ${PATCH_WRKSRC} ${PATCH_ARGS}" \	317	FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="-d ${PATCH_WRKSRC} ${PATCH_ARGS}" \
Lines 316-324 Link Here
316	STAGEDIR="${STAGEDIR}" MLLIB="${MLLIB}" \	318	STAGEDIR="${STAGEDIR}" MLLIB="${MLLIB}" \
317	INSTALLDIR="${STAGEDIR}${MLROOT}" RECOMPILEDIR="${RECOMPILEDIR}" \	319	INSTALLDIR="${STAGEDIR}${MLROOT}" RECOMPILEDIR="${RECOMPILEDIR}" \
318	CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' \	320	CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' \
319	AS='${AS}' ASFLAGS='${ASFLAGS}' CPPASFLAGS='${CPPASFLAGS}' \	321	AS='${AS}' ASFLAGS='${ASFLAGS}' EXTRA_DEFS='${EXTRA_DEFS}' \
320	EXTRA_DEFS='${EXTRA_DEFS}' \	322	./config/install.sh -default ${MLSIZE}
321	./config/install.sh
322	.endif	323	.endif
323	@${ECHO} '(* Installing man pages. *)'	324	@${ECHO} '(* Installing man pages. *)'
324	.for mansect in 1 2 3 4 5 6 7 8 9	325	.for mansect in 1 2 3 4 5 6 7 8 9

Lines 1-47 Link Here

(-)distinfo (-47 / +49 lines)
1	TIMESTAMP = 1564231693	1	TIMESTAMP = 1576341142
2	SHA256 (smlnj/110.91/MLRISC.tgz) = aa521ef48da51ab2cfe82098457d96b3ebc32217132e6e8b56d383543fe23ab1	2	SHA256 (smlnj/110.96/MLRISC.tgz) = 193c29217e592d3e5a67cd0bde14ebfed2a2c3e4bcfae1e151e8fbe148fbe69e
3	SIZE (smlnj/110.91/MLRISC.tgz) = 1459472	3	SIZE (smlnj/110.96/MLRISC.tgz) = 1460365
4	SHA256 (smlnj/110.91/asdl.tgz) = e8fa7c033776c6fa78c4f95e28af79a86c37b5548bfcfb0114cd532a83a823de	4	SHA256 (smlnj/110.96/asdl.tgz) = 2a521d8ba66ba1f2fc1c4b315bd43567ece21969026ce45b6f50d9132726724e
5	SIZE (smlnj/110.91/asdl.tgz) = 202161	5	SIZE (smlnj/110.96/asdl.tgz) = 205907
6	SHA256 (smlnj/110.91/boot.x86-unix.tgz) = a8d8d4cf85b5c0bbc5f254f46f9a0eb039a7bc704d18d41bf9a1be0c9d25dd38	6	SHA256 (smlnj/110.96/boot.amd64-unix.tgz) = 605a118476d251bd77e312f303df3039adea6ace521d9ac140e2187b904ec807
7	SIZE (smlnj/110.91/boot.x86-unix.tgz) = 6034212	7	SIZE (smlnj/110.96/boot.amd64-unix.tgz) = 6031590
8	SHA256 (smlnj/110.91/ckit.tgz) = 6d8f99d57fff2a210c3ecfd592841bca843f2b5e6697fe35340c6a1095a409d3	8	SHA256 (smlnj/110.96/boot.x86-unix.tgz) = ab08f260137fb68492d747b96d5be8ce49e8eda55a358094fd9018efd32341bd
9	SIZE (smlnj/110.91/ckit.tgz) = 200998	9	SIZE (smlnj/110.96/boot.x86-unix.tgz) = 6034356
10	SHA256 (smlnj/110.91/cm.tgz) = cd9bba3d54252197de3b7b4236cba90fec32e1aedb5df1c75af440ee8406ab73	10	SHA256 (smlnj/110.96/ckit.tgz) = 8b9301e3a2975be6877ce22edc27445630d57f51afbb77a950f386c9b3193bbf
11	SIZE (smlnj/110.91/cm.tgz) = 220371	11	SIZE (smlnj/110.96/ckit.tgz) = 201009
12	SHA256 (smlnj/110.91/cml.tgz) = 6ea50839c19c4fcf5880769401914b4c19b2c674942e131e7b2de56dfb8d5fea	12	SHA256 (smlnj/110.96/cm.tgz) = 19e4f8096f5c8af64f20e57c5b48dacf9054c90ec14db4908a9e8c5bc505c568
13	SIZE (smlnj/110.91/cml.tgz) = 105339	13	SIZE (smlnj/110.96/cm.tgz) = 220256
14	SHA256 (smlnj/110.91/compiler.tgz) = 70bef5bf9ba91ebb8067d335285be0bf9c127f5275ed9d4a14a6f81d99370047	14	SHA256 (smlnj/110.96/cml.tgz) = ec2b2d08343a32d911f30f34fb506fd0fed21b21378592e568107a68abc6ed8a
15	SIZE (smlnj/110.91/compiler.tgz) = 839212	15	SIZE (smlnj/110.96/cml.tgz) = 105379
16	SHA256 (smlnj/110.91/config.tgz) = 6690de2e4fa134db8e85ccc5bc58745cdd321a2cf72453c5116e3e7ea7786b03	16	SHA256 (smlnj/110.96/compiler.tgz) = 1382181001e0cf8d751c3d1707331f305e1ab3e41ca07af1349a73ef16df4a4c
17	SIZE (smlnj/110.91/config.tgz) = 515708	17	SIZE (smlnj/110.96/compiler.tgz) = 848920
18	SHA256 (smlnj/110.91/doc.tgz) = a12807833ae18484d486a503d8a106304082724985d320fd15f347a65b481dd0	18	SHA256 (smlnj/110.96/config.tgz) = b2bda33c1fb1472b4ca69827463b1b1b7b8a86bed72db959a558d9e4fe65de18
19	SIZE (smlnj/110.91/doc.tgz) = 2073179	19	SIZE (smlnj/110.96/config.tgz) = 517305
20	SHA256 (smlnj/110.91/eXene.tgz) = c435d78915a96c6079847aca882d89401c7aad5bcdaff9cad8a5639a215b9411	20	SHA256 (smlnj/110.96/doc.tgz) = 24243d3a58b50973d151304f878bd2e80a6ce71cefced114cb694b89e039641a
21	SIZE (smlnj/110.91/eXene.tgz) = 720702	21	SIZE (smlnj/110.96/doc.tgz) = 2134988
22	SHA256 (smlnj/110.91/heap2asm.tgz) = 1269b7e3a12e966ab73b463bc16a9bbf5c5acbe84d6acfd509a027854c918f25	22	SHA256 (smlnj/110.96/eXene.tgz) = 0c5d642c57380b0a427d4ce9f6af84c2bb76859089b36a4f5da3a2149d7fb2bf
23	SIZE (smlnj/110.91/heap2asm.tgz) = 1345	23	SIZE (smlnj/110.96/eXene.tgz) = 721127
24	SHA256 (smlnj/110.91/ml-burg.tgz) = 337e67312edd555a6f0f697198a832c2c181c8f71cace792dbc9ce9565c13585	24	SHA256 (smlnj/110.96/heap2asm.tgz) = 1cb94d9ba56c58cb122f7f9d548824e6a7fed155acd17ac4d10fb028ca7a4a50
25	SIZE (smlnj/110.91/ml-burg.tgz) = 40514	25	SIZE (smlnj/110.96/heap2asm.tgz) = 1395
26	SHA256 (smlnj/110.91/ml-lex.tgz) = f9b1ab56f981cc3edccaa106b8c1f95b1786ed3274eefd7422201c5ac85b5574	26	SHA256 (smlnj/110.96/ml-burg.tgz) = 4286a4aa01f2063bdbea10ab1c7299b7a41a4a822a96d4a040ce404b1b3276b1
27	SIZE (smlnj/110.91/ml-lex.tgz) = 27834	27	SIZE (smlnj/110.96/ml-burg.tgz) = 40552
28	SHA256 (smlnj/110.91/ml-lpt.tgz) = 8e95cb33c3ceb8f3d011a2c88cdea37d530d69fd472a3642df67f36fc7015d55	28	SHA256 (smlnj/110.96/ml-lex.tgz) = 02971b9026d2c6df8b425b8ac78c4065439a62e09b36fc974a98b5062874b8f0
29	SIZE (smlnj/110.91/ml-lpt.tgz) = 267088	29	SIZE (smlnj/110.96/ml-lex.tgz) = 27879
30	SHA256 (smlnj/110.91/ml-yacc.tgz) = 2bdcb0b60cb09063865f485cabcbe5b8e7e5ebc559499f6c0fcdf8c02f5f3728	30	SHA256 (smlnj/110.96/ml-lpt.tgz) = 3736cd60daad7510467ee2f31462cffbb43890bc4499b3efc7d671829f68e141
31	SIZE (smlnj/110.91/ml-yacc.tgz) = 101693	31	SIZE (smlnj/110.96/ml-lpt.tgz) = 267441
32	SHA256 (smlnj/110.91/nlffi.tgz) = b22b63471cfef6217706ec6da75357e36e45b185e3c3f2c791933dca22a755f6	32	SHA256 (smlnj/110.96/ml-yacc.tgz) = 3a8d4d345ec3832b30bde1a7b0c0f97f209f40afd80e6ff6e1c78f365a77b0e9
33	SIZE (smlnj/110.91/nlffi.tgz) = 75070	33	SIZE (smlnj/110.96/ml-yacc.tgz) = 101727
34	SHA256 (smlnj/110.91/old-basis.tgz) = 9098c4b3ec7496224020093e034ff728eadcc10ba7249810f9b1a16bb64b18ae	34	SHA256 (smlnj/110.96/nlffi.tgz) = fb08f68da401382396fe0cb676b0f81eda27e9360c69fbeb3d473dec3452e8ee
35	SIZE (smlnj/110.91/old-basis.tgz) = 1082	35	SIZE (smlnj/110.96/nlffi.tgz) = 75084
36	SHA256 (smlnj/110.91/pgraph.tgz) = e8620b4a458739a38f5d28ca22092273bf8cdb7fc30b3057123f238407acf2e8	36	SHA256 (smlnj/110.96/old-basis.tgz) = c3fea6a6b14d3c4cfad92944bd259f6b104a76f4b7ee8dd999275dcab8336199
37	SIZE (smlnj/110.91/pgraph.tgz) = 5429	37	SIZE (smlnj/110.96/old-basis.tgz) = 1215
38	SHA256 (smlnj/110.91/runtime.tgz) = e91ff66b5de40cfdc8a8d78200faae62522b601d0dd10c7647a30e5f37b9a84e	38	SHA256 (smlnj/110.96/pgraph.tgz) = 73f0a34fc2ac5ec9ba1aa10bb732300b0aea0a63d32154c108ce42b28d1d72a6
39	SIZE (smlnj/110.91/runtime.tgz) = 349128	39	SIZE (smlnj/110.96/pgraph.tgz) = 5430
40	SHA256 (smlnj/110.91/smlnj-c.tgz) = 043cdf239c777fc50a5b04752a6961a2e0aa1cdeb4a8d38bc04943e63b839dbc	40	SHA256 (smlnj/110.96/runtime.tgz) = 46ab1f6f4282ab46f117f8b8673e70180b8b4cbc6d9afdfa305aa8510258bf69
41	SIZE (smlnj/110.91/smlnj-c.tgz) = 10622	41	SIZE (smlnj/110.96/runtime.tgz) = 336178
42	SHA256 (smlnj/110.91/smlnj-lib.tgz) = 5c9323c4158bbb55159a7ce304643bc523461dbc856d9389bc19aa533d106a26	42	SHA256 (smlnj/110.96/smlnj-c.tgz) = 3c1064ba53990abf278ebe80f68b62dad14d9f6a044ac72c6f2cf602c6aaa28c
43	SIZE (smlnj/110.91/smlnj-lib.tgz) = 457827	43	SIZE (smlnj/110.96/smlnj-c.tgz) = 10620
44	SHA256 (smlnj/110.91/system.tgz) = 0b840476580689695a62b79f92ef383e6b20991002812abb349e1e9b83dea599	44	SHA256 (smlnj/110.96/smlnj-lib.tgz) = 7ff7e8008bc08f32f2080e83afa7c609171d9856ec46fcccaec7f44c309057fb
45	SIZE (smlnj/110.91/system.tgz) = 262075	45	SIZE (smlnj/110.96/smlnj-lib.tgz) = 457923
46	SHA256 (smlnj/110.91/trace-debug-profile.tgz) = bb55c348e907e47a36f9e67f6b834d06186bdaa8cde1e20c2f96095ed70deebf	46	SHA256 (smlnj/110.96/system.tgz) = 8f33d350c4027e326f4b910cba2c50ae215a0b6ce93fed380b02f48c19ce3161
47	SIZE (smlnj/110.91/trace-debug-profile.tgz) = 3936	47	SIZE (smlnj/110.96/system.tgz) = 274076
		48	SHA256 (smlnj/110.96/trace-debug-profile.tgz) = 5f24d0ae00fb8dde2cec660ca66395fcfcc417ee56faec7f5f420af18cabb80d
		49	SIZE (smlnj/110.96/trace-debug-profile.tgz) = 3935

Lines 1-7 Link Here

(-)files/do-patch-asdl_src_asdlgen_Makefile.in (-3 / +17 lines)
1	--- asdl/src/asdlgen/Makefile.in.orig 2018-08-28 15:36:58 UTC	1	--- asdl/src/asdlgen/Makefile.in.orig 2019-10-21 18:02:45 UTC
2	+++ asdl/src/asdlgen/Makefile.in	2	+++ asdl/src/asdlgen/Makefile.in
3	@@ -54,8 +54,10 @@ CM_FILES = back-end/sml/sources.cm \	3	@@ -35,10 +35,11 @@ INSTALL_WRAPPER = @ASDL_ROOT@/bin/install-sml-wrapper.
4		4
		5	# if specified, include the size option as an argument to ml-build
		6	#
		7	-ifneq (@HOSTSIZE@,)
		8	+#ifneq (@HOSTSIZE@,)
		9	+.if defined(@HOSTSIZE@)
		10	ML_BUILD_FLAGS += -@HOSTSIZE@
		11	ML_MAKEDEPEND_FLAGS += -@HOSTSIZE@
		12	-endif
		13	+.endif
		14
		15	#
		16	# generator tools
		17	@@ -62,8 +63,10 @@ CM_FILES = back-end/sml/sources.cm \
		18
5	CODE_FRAG_DIRS = back-end/sml	19	CODE_FRAG_DIRS = back-end/sml
6		20
7	-CODE_FRAG_FILES = $(patsubst %,%/fragments.sml,$(CODE_FRAG_DIRS))	21	-CODE_FRAG_FILES = $(patsubst %,%/fragments.sml,$(CODE_FRAG_DIRS))
Lines 13-19 Link Here
13		27
14	SRCDIR = @ASDLGEN_SRCDIR@	28	SRCDIR = @ASDLGEN_SRCDIR@
15		29
16	@@ -94,14 +96,18 @@ back-end/sml/fragments.sml:	30	@@ -102,14 +105,18 @@ back-end/sml/fragments.sml:
17	touch .depend	31	touch .depend
18	$(ML_MAKEDEPEND) $(ML_MAKEDEPEND_FLAGS) -n -f .depend $(ROOT_CM) $(HEAP) \|\| rm -f .depend	32	$(ML_MAKEDEPEND) $(ML_MAKEDEPEND_FLAGS) -n -f .depend $(ROOT_CM) $(HEAP) \|\| rm -f .depend
19		33

Lines 1-43 Link Here

(-)files/do-patch-base_runtime_include_ml-unixdep.h (-32 / +15 lines)
1	--- base/runtime/include/ml-unixdep.h.orig 2019-06-19 18:37:43 UTC	1	--- base/runtime/include/ml-unixdep.h.orig 2019-11-14 19:24:04 UTC
2	+++ base/runtime/include/ml-unixdep.h	2	+++ base/runtime/include/ml-unixdep.h
3	@@ -37,6 +37,7 @@	3	@@ -33,9 +33,10 @@
		4	* HAS_UCONTEXT if signal handlers have a ucontext_t argument.
		5	* HAS_STRERROR if the system provides the ISO C strerror function.
4	* INT_GIDLIST if the second argument to getgroups is int[].	6	* INT_GIDLIST if the second argument to getgroups is int[].
		7	+ * HAS_MKSTEMP if OS provides the POSIX mkstemp function.
5	* STAT_HAS_TIMESPEC if the time fields in the "struct stat" type have	8	* STAT_HAS_TIMESPEC if the time fields in the "struct stat" type have
6	* type "struct timespec".	9	* type "struct timespec".
7	+ * HAS_MKSTEMP if OS provides the POSIX mkstemp function.	10	- * HAS_NANOSLEEP if the system provides the nanosleep(2) function.
		11	+ * HAS_NANOSLEEP if the system provides the nanosleep(2) function.
8	*	12	*
9	* Note that only one of the following sets of symbols should be defined:	13	* Note that only one of the following sets of symbols should be defined:
10	* { HAS_MMAP, HAS_ANON_MMAP, HAS_VM_ALLOCATE }	14	* { HAS_MMAP, HAS_ANON_MMAP, HAS_VM_ALLOCATE }
11	@@ -94,6 +95,7 @@	15	@@ -208,8 +209,11 @@ extern char *sys_errlist[];
12	# define HAS_POLL	16	# define HAS_SELECT
13	# define HAS_SIGCONTEXT	17	# define HAS_UCONTEXT
14	# define HAS_STRERROR	18	# define HAS_STRERROR
15	+# define HAS_MKSTEMP	19	+# define HAS_MKSTEMP
16
17	/* These declarations are not in <errno.h> */
18	extern int sys_nerr;
19	@@ -204,6 +206,7 @@ extern char *sys_errlist[];
20	# define HAS_SIGCONTEXT
21	# define HAS_STRERROR
22	# define STAT_HAS_TIMESPEC	20	# define STAT_HAS_TIMESPEC
23	+# define HAS_MKSTEMP	21	# define HAS_NANOSLEEP
		22	+/* FreeBSD uses MAP_ANON for MAP_ANONYMOUS */
		23	+# define MAP_ANONYMOUS MAP_ANON
24		24
25	/* FreeBSD uses MAP_ANON for MAP_ANONYMOUS */	25	#elif defined(OPSYS_NETBSD) /* version 3.x */
26	# define MAP_ANONYMOUS MAP_ANON	26	# define OS_NAME "BSD"
27	@@ -254,6 +257,16 @@ extern char *sys_errlist[];
28
29	#include <features.h>
30
31	+#endif
32	+
33	+#if defined(OPSYS_FREEBSD)
34	+# if defined(INCLUDE_FREEBSD_I386__TYPES)
35	+# include <sys/cdefs.h>
36	+# include INCLUDE_FREEBSD_I386__TYPES
37	+# endif
38	+# if defined(INCLUDE_FREEBSD_I386_SIGNAL)
39	+# include INCLUDE_FREEBSD_I386_SIGNAL
40	+# endif
41	#endif
42
43	#include <unistd.h>

Lines 1-4 Link Here

(-)files/do-patch-base_runtime_objs_makefile (-38 / +10 lines)
1	--- base/runtime/objs/makefile.orig 2019-06-18 21:06:21 UTC	1	--- base/runtime/objs/makefile.orig 2019-11-10 14:00:54 UTC
2	+++ base/runtime/objs/makefile	2	+++ base/runtime/objs/makefile
3	@@ -5,10 +5,12 @@	3	@@ -5,10 +5,12 @@
4		4
Lines 6-65 Link Here
6	MAKE = make	6	MAKE = make
7	-CC = cc	7	-CC = cc
8	-CPP = /lib/cpp	8	-CPP = /lib/cpp
		9	-LD_LIBS =
		10	-AS = as
9	+CC ?= cc	11	+CC ?= cc
		12	+CFLAGS ?=
10	+CPP ?= /lib/cpp	13	+CPP ?= /lib/cpp
11	LD_LIBS =	14	+LD_LIBS ?=
12	-AS = as
13	+AS ?= as	15	+AS ?= as
14	+ASFLAGS ?=	16	+ASFLAGS ?=
15	+CPPASFLAGS ?=
16	AR = ar	17	AR = ar
17	ARFLAGS = rcv	18	ARFLAGS = rcv
18	RANLIB = ranlib	19	RANLIB = ranlib
19	@@ -38,7 +40,7 @@ BC_DIR = $(ROOT_DIR)/bytecode	20	@@ -37,8 +39,6 @@ MP_DIR = $(ROOT_DIR)/mp
20	CLIB_DIR = $(ROOT_DIR)/c-libs	21	CLIB_DIR = $(ROOT_DIR)/c-libs
21	CONFIG_DIR = $(ROOT_DIR)/config	22	CONFIG_DIR = $(ROOT_DIR)/config
22		23
23	-CFLAGS = -O	24	-CFLAGS = -O
24	+CFLAGS ?= -O	25	-
25
26	INCLUDES = -I$(OBJS_DIR) -I$(INC_DIR)	26	INCLUDES = -I$(OBJS_DIR) -I$(INC_DIR)
27	GC_INCLUDES = $(INCLUDES) -I$(GC_DIR)	27	GC_INCLUDES = $(INCLUDES) -I$(GC_DIR)
28	@@ -275,8 +277,8 @@ prim.o: $(MACH_DIR)/$(TARGET).prim.asm \	28	GEN_INCLUDES = -I$(CONFIG_DIR) $(INCLUDES)
29	$(INC_DIR)/asm-base.h \	29	@@ -275,7 +275,7 @@ prim.o: $(MACH_DIR)/$(TARGET).prim.asm \
30	$(MACH_DIR)/x86-syntax.h \	30	$(MACH_DIR)/x86-syntax.h \
31	mlstate-offsets.h	31	mlstate-offsets.h
32	- $(CPP) -D_ASM_ $(DEFS) $(INCLUDES) $(MACH_DIR)/$(TARGET).prim.asm > prim.s	32	$(CPP) -D_ASM_ $(DEFS) $(INCLUDES) $(MACH_DIR)/$(TARGET).prim.asm > prim.s
33	- $(AS) -o prim.o prim.s	33	- $(AS) -o prim.o prim.s
34	+ $(CPP) -D_ASM_ $(DEFS) $(CPPASFLAGS) $(INCLUDES) $(MACH_DIR)/$(TARGET).prim.asm > prim.s
35	+ $(AS) $(ASFLAGS) -o prim.o prim.s	34	+ $(AS) $(ASFLAGS) -o prim.o prim.s
36		35
37	$(MACH_DIR)/BYTECODE.prim.asm: bc-instr-def.h $(BC_DIR)/bc-instrs.h $(BC_DIR)/bc.h
38
39	@@ -318,7 +320,7 @@ memory-trace.o: $(BC_DIR)/memory-trace.c \
40	primops.o: $(BC_DIR)/primops.asm \
41	$(INC_DIR)/asm-base.h
42	$(CPP) -D_ASM_ $(DEFS) $(INCLUDES) $(BC_DIR)/primops.asm > primops.s
43	- $(AS) -o primops.o primops.s
44	+ $(AS) $(ASFLAGS) -o primops.o primops.s
45
46	bc-instr-def.h: gen-bc-instr-def \
47	$(BC_DIR)/bc.h $(BC_DIR)/print-bc.h
48	@@ -330,7 +332,7 @@ bc-instr-def.h: gen-bc-instr-def \
49	#	36	#
50	MK_ARGS = VERSION="$(VERSION)" \
51	MAKE="$(MAKE)" \
52	- CC="$(CC)" CFLAGS="$(CFLAGS)" DEFS="$(DEFS)" \
53	+ CC="$(CC)" CFLAGS="$(CFLAGS)" DEFS='$(DEFS)' \
54	AR="$(AR)" ARFLAGS="$(ARFLAGS)" \
55	RANLIB="$(RANLIB)" \
56	INCLUDES="$(GC_INCLUDES) -I../bytecode"
57	@@ -421,7 +423,7 @@ LIB_INCLUDES = -I$(LIB_OBJS_DIR) -I$(LIB_INC_DIR) -I..
58	#	37	#
59	LIB_MK_ARGS = VERSION="$(VERSION)" \
60	MAKE="$(MAKE)" \
61	- CC="$(CC)" CFLAGS="$(CFLAGS)" DEFS="$(DEFS)" \
62	+ CC="$(CC)" CFLAGS="$(CFLAGS)" DEFS='$(DEFS)' \
63	AR="$(AR)" ARFLAGS="$(ARFLAGS)" \
64	RANLIB="$(RANLIB)" \
65	INCLUDES="$(LIB_INCLUDES)"

Line 0 Link Here

(-)files/do-patch-base_runtime_objs_mk.amd64-freebsd (+32 lines)
	1	--- base/runtime/objs/mk.amd64-freebsd.orig 2019-11-14 19:33:11 UTC
	2	+++ base/runtime/objs/mk.amd64-freebsd
	3	@@ -1,4 +1,4 @@
	4	-# mk.amd64-freebst
	5	+# mk.amd64-freebsd
	6	#
	7	# makefile for "Free BSD" on the amd64 architecture, which is a BSD 4.4 clone.
	8	#
	9	@@ -6,9 +6,10 @@
	10	SHELL = /bin/sh
	11
	12	MAKE = make
	13	-AS = as --64
	14	-CC = cc -std=gnu99
	15	-CFLAGS = -O2 -m64
	16	+AS ?= cc -x assembler -c
	17	+ASFLAGS ?= -fPIC
	18	+CC ?= cc -std=gnu99
	19	+CFLAGS ?= -O2 -m64 -fPIC
	20	CPP = cc -x assembler-with-cpp -E -P
	21	XOBJS =
	22	XLIBS = ../c-libs/dl/libunix-dynload.a
	23	@@ -26,6 +27,6 @@ RUNTIME_SO = run.amd64-freebsd.so
	24	RUNTIME_A = run.amd64-freebsd.a
	25
	26	all:
	27	- ($(MAKE) CHECK_HEAP=$(CHECK_HEAP) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
	28	-# ($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared" $(RUNTIME_SO))
	29	-# ($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))
	30	+ ($(MAKE) CHECK_HEAP=$(CHECK_HEAP) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
	31	+ ($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared -Wl,-z,notext" $(RUNTIME_SO))
	32	+ ($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))

Lines 1-37 Link Here

(-)files/do-patch-base_runtime_objs_mk.x86-freebsd (-25 / +31 lines)
1	--- base/runtime/objs/mk.x86-freebsd.orig 2006-04-20 15:28:53 UTC	1	--- base/runtime/objs/mk.x86-freebsd.orig 2019-11-14 19:19:39 UTC
2	+++ base/runtime/objs/mk.x86-freebsd	2	+++ base/runtime/objs/mk.x86-freebsd
3	@@ -5,19 +5,19 @@	3	@@ -6,20 +6,20 @@
4
5	SHELL = /bin/sh	4	SHELL = /bin/sh
6		5
7	-MAKE = gmake	6	MAKE = make
8	+MAKE = make	7	-
9		8	-AS = as --32
10	ARFLAGS = Trcv	9	-CC = cc -std=gnu99
11	-CC = gcc -ansi	10	-CFLAGS = -O2 -m32
12	-CFLAGS = -O2	11	+AS ?= cc -x assembler -c
13	-CPP = gcc -x assembler-with-cpp -E -P	12	+ASFLAGS ?= -fPIC
14	+CC ?= gcc -ansi	13	+CC ?= cc -std=gnu99
15	+CFLAGS ?= -O2	14	+CFLAGS ?= -O2 -m32 -fPIC
16	+CPP = $(CC) -x assembler-with-cpp -E -P	15	CPP = cc -x assembler-with-cpp -E -P
17	#CPP = /usr/bin/cpp -P	16	-#CPP = /usr/bin/cpp -P
18		17	-ARFLAGS = Trcv
		18	-
19	XOBJS =	19	XOBJS =
20	XLIBS = ../c-libs/dl/libunix-dynload.a	20	XLIBS = ../c-libs/dl/libunix-dynload.a
21	LD_LIBS =	21	-LD_LIBS =
		22	+LD_LIBS = -ldl
		23	+#CHECK_HEAP = check-heap.o
		24	+XDEFS = -DASSERT_ON
22	BASE_DEFS =	25	BASE_DEFS =
23	-DEFS = $(BASE_DEFS) -DHOST_X86 -DTARGET_X86 -DOPSYS_UNIX -DOPSYS_FREEBSD -DDLOPEN	26	-DEFS = $(BASE_DEFS) -DARCH_X86 -DDSIZE_32 -DOPSYS_UNIX -DOPSYS_FREEBSD \
24	+DEFS = $(BASE_DEFS) -DHOST_X86 -DTARGET_X86 -DOPSYS_UNIX -DOPSYS_FREEBSD -DDLOPEN $(EXTRA_DEFS)	27	- -DGNU_ASSEMBLER -DDLOPEN -DINDIRECT_CFUNC
		28	+DEFS = $(XDEFS) $(BASE_DEFS) -DARCH_X86 -DSIZE_32 \
		29	+ -DOPSYS_UNIX -DOPSYS_FREEBSD -D_GNU_SOURCE -DGNU_ASSEMBLER -DDLOPEN \
		30	+ -DINDIRECT_CFUNC
25	TARGET = X86	31	TARGET = X86
26	VERSION = v-x86-freebsd	32	VERSION = v-x86-freebsd
27	RUNTIME = run.x86-freebsd	33	RUNTIME = run.x86-freebsd
28	@@ -25,6 +25,6 @@ RUNTIME_SO = run.x86-freebsd.so	34	@@ -27,6 +27,6 @@ RUNTIME_SO = run.x86-freebsd.so
29	RUNTIME_A = run.x86-freebsd.a	35	RUNTIME_A = run.x86-freebsd.a
30		36
31	all:	37	all:
32	- ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))	38	- ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
33	- ($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared" $(RUNTIME_SO))	39	-# ($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared" $(RUNTIME_SO))
34	- ($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))	40	-# ($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))
35	+ ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="$(LDFLAGS)" $(RUNTIME))	41	+ ($(MAKE) CHECK_HEAP=$(CHECK_HEAP) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME))
36	+ ($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared $(LDFLAGS)" $(RUNTIME_SO))	42	+ ($(MAKE) RUNTIME="$(RUNTIME_SO)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="-shared -Wl,-z,notext" $(RUNTIME_SO))
37	+ ($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="$(LDFLAGS)" $(RUNTIME_A))	43	+ ($(MAKE) RUNTIME_A="$(RUNTIME_A)" VERSION="$(VERSION)" AS="$(AS)" ASFLAGS="$(ASFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" LDFLAGS="" $(RUNTIME_A))

Lines 1-33 Link Here

(-)files/patch-config___heap2exec (-33 lines)
1	--- config/_heap2exec.orig 2019-05-31 12:36:14 UTC
2	+++ config/_heap2exec
3	@@ -89,6 +89,7 @@ SO_LIBS=
4	A_PROG=
5	A_FLAGS=
6	A_LIBS=
7	+AS_FLAGS=
8
9	case ${OPSYS} in
10	darwin)
11	@@ -102,6 +103,13 @@ case ${OPSYS} in
12	A_PROG=${CC}
13	A_FLAGS=-Wl,--export-dynamic
14	A_LIBS=-lm
15	+ case `uname -m` in
16	+ amd64)
17	+ SO_FLAGS="${SO_FLAGS} -m32"
18	+ A_FLAGS="${A_FLAGS} -m32"
19	+ AS_FLAGS="${AS_FLAGS} -m32"
20	+ ;;
21	+ esac
22	;;
23	linux)
24	SO_PROG=${CC}
25	@@ -122,7 +130,7 @@ fi
26	RESULT=0
27	if ${H2A} "$heapfile" "$execfile".s ; then
28	if [ -f "$execfile".s ] ; then
29	- if ${CC} -c -o "$execfile".o "$execfile".s ; then
30	+ if ${CC} -c ${AS_FLAGS} -o "$execfile".o "$execfile".s ; then
31	rm "$execfile".s
32	else
33	rm "$execfile".s

Lines 1-7 Link Here

(-)files/patch-config_install.sh (-19 / +18 lines)
1	--- config/install.sh.orig 2019-05-31 12:15:03 UTC	1	--- config/install.sh.orig 2019-11-23 16:06:59 UTC
2	+++ config/install.sh	2	+++ config/install.sh
3	@@ -17,6 +17,8 @@ else	3	@@ -56,11 +56,36 @@ if [ x"$SIZE_OPT" = x ] ; then
4	nolib=false	4	SIZE_OPT="-"$DEFAULT_SIZE
5	fi	5	fi
6		6
7	+[ -n "$RECOMPILEDIR" ] && echo "RECOMPILEDIR=$RECOMPILEDIR"	7	+[ -n "$RECOMPILEDIR" ] && echo "RECOMPILEDIR=$RECOMPILEDIR"
Lines 9-21 Link Here
9	if [ x${INSTALL_QUIETLY} = xtrue ] ; then	9	if [ x${INSTALL_QUIETLY} = xtrue ] ; then
10	export CM_VERBOSE	10	export CM_VERBOSE
11	CM_VERBOSE=false	11	CM_VERBOSE=false
12	@@ -37,6 +39,28 @@ complain() {	12	fi
13	exit 1
14	}
15		13
16	+#	14	+#
17	+# do_patch patch-file	15	+# do_patch patch-file
18	+# apply a patch file	16	+# apply a patch file
		17	+#
19	+do_patch() {	18	+do_patch() {
20	+ patchfile=$FILESDIR/$1	19	+ patchfile=$FILESDIR/$1
21	+	20	+
Lines 35-44 Link Here
35	+ fi	34	+ fi
36	+}	35	+}
37	+	36	+
38	this=$0	37	vsay() {
39		38	if [ x${INSTALL_DEBUG} = xtrue ] ; then
40		39	echo "$@"
41	@@ -96,7 +120,28 @@ trap 'cd "$ROOT"; rm -f $tmpfiles' 0 1 2 3 15	40	@@ -128,7 +153,28 @@ trap 'cd "$ROOT"; rm -f $tmpfiles' 0 1 2 3 15
42	# Especially important is CM_PATHCONFIG.	41	# Especially important is CM_PATHCONFIG.
43	#	42	#
44	export CM_PATHCONFIG	43	export CM_PATHCONFIG
Lines 68-74 Link Here
68	#	67	#
69	# the release version that we are installing	68	# the release version that we are installing
70	#	69	#
71	@@ -371,7 +416,12 @@ esac	70	@@ -403,7 +449,12 @@ esac
72	# the name of the bin files directory	71	# the name of the bin files directory
73	#	72	#
74	BOOT_ARCHIVE=boot.$ARCH-unix	73	BOOT_ARCHIVE=boot.$ARCH-unix
Lines 82-88 Link Here
82		81
83	#	82	#
84	# build the run-time system	83	# build the run-time system
85	@@ -380,9 +430,15 @@ if [ -x "$RUNDIR"/run.$ARCH-$OPSYS ]; then	84	@@ -412,9 +463,15 @@ if [ -x "$RUNDIR"/run.$ARCH-$OPSYS ]; then
86	vsay $this: Run-time system already exists.	85	vsay $this: Run-time system already exists.
87	else	86	else
88	"$CONFIGDIR"/unpack "$ROOT" runtime	87	"$CONFIGDIR"/unpack "$ROOT" runtime
Lines 99-105 Link Here
99	if [ -x run.$ARCH-$OPSYS ]; then	98	if [ -x run.$ARCH-$OPSYS ]; then
100	mv run.$ARCH-$OPSYS "$RUNDIR"	99	mv run.$ARCH-$OPSYS "$RUNDIR"
101	if [ -f runx.$ARCH-$OPSYS ]; then	100	if [ -f runx.$ARCH-$OPSYS ]; then
102	@@ -394,7 +450,7 @@ else	101	@@ -426,7 +483,7 @@ else
103	if [ -f run.$ARCH-$OPSYS.a ]; then	102	if [ -f run.$ARCH-$OPSYS.a ]; then
104	mv run.$ARCH-$OPSYS.a "$RUNDIR"	103	mv run.$ARCH-$OPSYS.a "$RUNDIR"
105	fi	104	fi
Lines 108-114 Link Here
108	else	107	else
109	complain "$this: !!! Run-time system build failed for some reason."	108	complain "$this: !!! Run-time system build failed for some reason."
110	fi	109	fi
111	@@ -420,7 +476,7 @@ if [ -r "$HEAPDIR"/sml.$HEAP_SUFFIX ]; then	110	@@ -452,7 +509,7 @@ if [ -r "$HEAPDIR"/sml.$HEAP_SUFFIX ]; then
112	complain "$this !!! Unable to re-create heap image (sml.$HEAP_SUFFIX)."	111	complain "$this !!! Unable to re-create heap image (sml.$HEAP_SUFFIX)."
113	fi	112	fi
114	else	113	else
Lines 117-123 Link Here
117		116
118	fish "$ROOT"/"$BOOT_FILES"/smlnj/basis	117	fish "$ROOT"/"$BOOT_FILES"/smlnj/basis
119		118
120	@@ -455,7 +511,7 @@ else	119	@@ -487,7 +544,7 @@ else
121	cd "$ROOT"/"$BOOT_FILES"	120	cd "$ROOT"/"$BOOT_FILES"
122	for anchor in * ; do	121	for anchor in * ; do
123	if [ -d $anchor ] ; then	122	if [ -d $anchor ] ; then
Lines 126-132 Link Here
126	move $anchor "$LIBDIR"/$anchor	125	move $anchor "$LIBDIR"/$anchor
127	fi	126	fi
128	done	127	done
129	@@ -478,6 +534,18 @@ installdriver _ml-build ml-build	128	@@ -510,6 +567,18 @@ installdriver _ml-build ml-build
130		129
131	cd "$ROOT"	130	cd "$ROOT"
132		131
Lines 145-151 Link Here
145	#	144	#
146	# Now do all the rest using the precompiled installer	145	# Now do all the rest using the precompiled installer
147	# (see base/system/smlnj/installer for details)	146	# (see base/system/smlnj/installer for details)
148	@@ -487,6 +555,12 @@ if [ $nolib = false ] ; then	147	@@ -519,6 +588,12 @@ if [ $nolib = false ] ; then
149	export ROOT INSTALLDIR CONFIGDIR BINDIR	148	export ROOT INSTALLDIR CONFIGDIR BINDIR
150	CM_TOLERATE_TOOL_FAILURES=true	149	CM_TOLERATE_TOOL_FAILURES=true
151	export CM_TOLERATE_TOOL_FAILURES	150	export CM_TOLERATE_TOOL_FAILURES
Lines 155-164 Link Here
155	+ # propagated to the resulting heaps because the heaps generated	154	+ # propagated to the resulting heaps because the heaps generated
156	+ # in this stage don't contain the compiler.	155	+ # in this stage don't contain the compiler.
157	+ [ -z "$STAGEDIR" ] \|\| CM_PATHCONFIG=$CM_LOCAL_PATHCONFIG	156	+ [ -z "$STAGEDIR" ] \|\| CM_PATHCONFIG=$CM_LOCAL_PATHCONFIG
158	if "$BINDIR"/sml -m \$smlnj/installer.cm	157	if "$BINDIR"/sml $SIZE_OPT -m \$smlnj/installer.cm
159	then	158	then
160	vsay $this: Installation complete.	159	vsay $this: Installation complete.
161	@@ -494,5 +568,20 @@ if [ $nolib = false ] ; then	160	@@ -526,5 +601,20 @@ if [ $nolib = false ] ; then
162	complain "$this: !!! Installation of libraries and programs failed."	161	complain "$this: !!! Installation of libraries and programs failed."
163	fi	162	fi
164	fi	163	fi

Lines 10-16 Link Here

(-)pkg-plist (-16 / +5 lines)
10	smlnj/bin/.heap/ml-antlr.%%MLARCH%%-bsd	10	smlnj/bin/.heap/ml-antlr.%%MLARCH%%-bsd
11	smlnj/bin/.heap/ml-burg.%%MLARCH%%-bsd	11	smlnj/bin/.heap/ml-burg.%%MLARCH%%-bsd
12	smlnj/bin/.heap/ml-lex.%%MLARCH%%-bsd	12	smlnj/bin/.heap/ml-lex.%%MLARCH%%-bsd
13	smlnj/bin/.heap/ml-nlffigen.%%MLARCH%%-bsd	13	%%MLSIZE32%%smlnj/bin/.heap/ml-nlffigen.%%MLARCH%%-bsd
14	smlnj/bin/.heap/ml-ulex.%%MLARCH%%-bsd	14	smlnj/bin/.heap/ml-ulex.%%MLARCH%%-bsd
15	smlnj/bin/.heap/ml-yacc.%%MLARCH%%-bsd	15	smlnj/bin/.heap/ml-yacc.%%MLARCH%%-bsd
16	%%EVERYTHING%%smlnj/bin/.heap/nowhere.%%MLARCH%%-bsd	16	%%EVERYTHING%%smlnj/bin/.heap/nowhere.%%MLARCH%%-bsd
Lines 28-34 Link Here
28	smlnj/bin/ml-burg	28	smlnj/bin/ml-burg
29	smlnj/bin/ml-lex	29	smlnj/bin/ml-lex
30	smlnj/bin/ml-makedepend	30	smlnj/bin/ml-makedepend
31	smlnj/bin/ml-nlffigen	31	%%MLSIZE32%%smlnj/bin/ml-nlffigen
32	smlnj/bin/ml-ulex	32	smlnj/bin/ml-ulex
33	smlnj/bin/ml-yacc	33	smlnj/bin/ml-yacc
34	%%EVERYTHING%%smlnj/bin/nowhere	34	%%EVERYTHING%%smlnj/bin/nowhere
Lines 40-46 Link Here
40	smlnj/lib/SMLNJ-LIB/PP/.cm/%%MLARCH%%-unix/pp-lib.cm	40	smlnj/lib/SMLNJ-LIB/PP/.cm/%%MLARCH%%-unix/pp-lib.cm
41	smlnj/lib/SMLNJ-LIB/Util/.cm/%%MLARCH%%-unix/smlnj-lib.cm	41	smlnj/lib/SMLNJ-LIB/Util/.cm/%%MLARCH%%-unix/smlnj-lib.cm
42	smlnj/lib/SMLNJ-ML-YACC-LIB/.cm/%%MLARCH%%-unix/ml-yacc-lib.cm	42	smlnj/lib/SMLNJ-ML-YACC-LIB/.cm/%%MLARCH%%-unix/ml-yacc-lib.cm
43	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/ALPHA.cm
44	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/AMD64-Peephole.cm	43	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/AMD64-Peephole.cm
45	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/AMD64.cm	44	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/AMD64.cm
46	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall-Vararg.cm	45	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall-Vararg.cm
Lines 50-56 Link Here
50	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall.cm	49	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall.cm
51	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Control.cm	50	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Control.cm
52	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Graphs.cm	51	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Graphs.cm
53	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/HPPA.cm
54	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/IA32-Peephole.cm	52	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/IA32-Peephole.cm
55	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/IA32.cm	53	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/IA32.cm
56	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Lib.cm	54	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Lib.cm
Lines 67-75 Link Here
67	smlnj/lib/asdl-lib.cm/.cm/%%MLARCH%%-unix/asdl-lib.cm	65	smlnj/lib/asdl-lib.cm/.cm/%%MLARCH%%-unix/asdl-lib.cm
68	smlnj/lib/asdlgen-tool.cm/.cm/%%MLARCH%%-unix/asdlgen-tool.cm	66	smlnj/lib/asdlgen-tool.cm/.cm/%%MLARCH%%-unix/asdlgen-tool.cm
69	smlnj/lib/burg-ext.cm/.cm/%%MLARCH%%-unix/burg-ext.cm	67	smlnj/lib/burg-ext.cm/.cm/%%MLARCH%%-unix/burg-ext.cm
70	smlnj/lib/c/.cm/%%MLARCH%%-unix/c.cm	68	%%MLSIZE32%%smlnj/lib/c/.cm/%%MLARCH%%-unix/c.cm
71	smlnj/lib/c/internals/.cm/%%MLARCH%%-unix/c-int.cm	69	%%MLSIZE32%%smlnj/lib/c/internals/.cm/%%MLARCH%%-unix/c-int.cm
72	smlnj/lib/c/memory/.cm/%%MLARCH%%-unix/memory.cm	70	%%MLSIZE32%%smlnj/lib/c/memory/.cm/%%MLARCH%%-unix/memory.cm
73	smlnj/lib/ckit-lib.cm/.cm/%%MLARCH%%-unix/ckit-lib.cm	71	smlnj/lib/ckit-lib.cm/.cm/%%MLARCH%%-unix/ckit-lib.cm
74	smlnj/lib/cml/.cm/%%MLARCH%%-unix/basis.cm	72	smlnj/lib/cml/.cm/%%MLARCH%%-unix/basis.cm
75	smlnj/lib/cml/.cm/%%MLARCH%%-unix/cml-internal.cm	73	smlnj/lib/cml/.cm/%%MLARCH%%-unix/cml-internal.cm
Lines 122-132 Link Here
122	smlnj/lib/smlnj/.cm/%%MLARCH%%-unix/compiler.cm	120	smlnj/lib/smlnj/.cm/%%MLARCH%%-unix/compiler.cm
123	smlnj/lib/smlnj/.cm/%%MLARCH%%-unix/installer.cm	121	smlnj/lib/smlnj/.cm/%%MLARCH%%-unix/installer.cm
124	smlnj/lib/smlnj/.cm/%%MLARCH%%-unix/library-install.cm	122	smlnj/lib/smlnj/.cm/%%MLARCH%%-unix/library-install.cm
125	smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/ALPHA.cm
126	smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/AMD64.cm	123	smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/AMD64.cm
127	smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/Control.cm	124	smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/Control.cm
128	smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/Graphs.cm	125	smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/Graphs.cm
129	smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/HPPA.cm
130	smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/IA32.cm	126	smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/IA32.cm
131	smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/Lib.cm	127	smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/Lib.cm
132	smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/MLRISC.cm	128	smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/MLRISC.cm
Lines 137-157 Link Here
137	smlnj/lib/smlnj/basis/.cm/%%MLARCH%%-unix/basis.cm	133	smlnj/lib/smlnj/basis/.cm/%%MLARCH%%-unix/basis.cm
138	smlnj/lib/smlnj/cm/.cm/%%MLARCH%%-unix/cm.cm	134	smlnj/lib/smlnj/cm/.cm/%%MLARCH%%-unix/cm.cm
139	smlnj/lib/smlnj/cm/.cm/%%MLARCH%%-unix/tools.cm	135	smlnj/lib/smlnj/cm/.cm/%%MLARCH%%-unix/tools.cm
140	smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/alpha32-unix.cm
141	smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/amd64-unix.cm	136	smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/amd64-unix.cm
142	smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/current.cm	137	smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/current.cm
143	smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/hppa-unix.cm
144	smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/ppc-macos.cm
145	smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/ppc-unix.cm	138	smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/ppc-unix.cm
146	smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/sparc-unix.cm	139	smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/sparc-unix.cm
147	smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/x86-unix.cm	140	smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/x86-unix.cm
148	smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/x86-win32.cm	141	smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/x86-win32.cm
149	smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/all.cm	142	smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/all.cm
150	smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/alpha32.cm
151	smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/amd64.cm	143	smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/amd64.cm
152	smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/compiler.cm	144	smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/compiler.cm
153	smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/current.cm	145	smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/current.cm
154	smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/hppa.cm
155	smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/minimal-only.cm	146	smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/minimal-only.cm
156	smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/minimal.cm	147	smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/minimal.cm
157	smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/ppc.cm	148	smlnj/lib/smlnj/compiler/.cm/%%MLARCH%%-unix/ppc.cm
Lines 170-176 Link Here
170	smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/html-lib.cm	161	smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/html-lib.cm
171	smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/pp-lib.cm	162	smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/pp-lib.cm
172	smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/smlnj-lib.cm	163	smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/smlnj-lib.cm
173	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/alpha32.cm
174	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/amd64.cm	164	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/amd64.cm
175	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/basics.cm	165	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/basics.cm
176	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/core.cm	166	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/core.cm
Lines 178-184 Link Here
178	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/elabdata.cm	168	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/elabdata.cm
179	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/elaborate.cm	169	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/elaborate.cm
180	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/execute.cm	170	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/execute.cm
181	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/hppa.cm
182	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/parser.cm	171	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/parser.cm
183	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/ppc.cm	172	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/ppc.cm
184	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/sparc.cm	173	smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/sparc.cm