diff options
author | dholland <dholland@pkgsrc.org> | 2016-07-03 19:35:36 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2016-07-03 19:35:36 +0000 |
commit | 7bc9c414df034c5c0c31caecc4e59afa1ca5b640 (patch) | |
tree | c4658ee5ea19f2d7a36d2ee9bacc6630d1ae7542 /lang/smlnj11072 | |
parent | d62e21214057ab132ffb2b7576292e4e0146c10f (diff) | |
download | pkgsrc-7bc9c414df034c5c0c31caecc4e59afa1ca5b640.tar.gz |
Sync new patches from main smlnj package; they all apply.
Diffstat (limited to 'lang/smlnj11072')
12 files changed, 241 insertions, 6 deletions
diff --git a/lang/smlnj11072/Makefile b/lang/smlnj11072/Makefile index b592d2ad192..1176988597a 100644 --- a/lang/smlnj11072/Makefile +++ b/lang/smlnj11072/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2016/07/03 19:26:35 dholland Exp $ +# $NetBSD: Makefile,v 1.9 2016/07/03 19:35:36 dholland Exp $ # DISTNAME= boot.${BOX}-unix @@ -50,6 +50,9 @@ BUILD_ENV+= SMLNJ_HOME="${WRKDIR}" # the build uses patch directly (yuk) BUILD_ENV+= PATCH=${PATCH:Q} PATCH_ARGS=${PATCH_ARGS:Q} +# useful for debugging +#CFLAGS+= -Wall + # note that this includes bsd.prefs.mk .include "../../lang/smlnj/Makefile.common" diff --git a/lang/smlnj11072/distinfo b/lang/smlnj11072/distinfo index 5ab867ac4a6..49f3060d710 100644 --- a/lang/smlnj11072/distinfo +++ b/lang/smlnj11072/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2016/07/03 19:29:27 dholland Exp $ +$NetBSD: distinfo,v 1.9 2016/07/03 19:35:36 dholland Exp $ SHA1 (smlnj-110.72/MLRISC.tgz) = 9bb9eb169337533304c2e0e4eb9af263d38c398a RMD160 (smlnj-110.72/MLRISC.tgz) = 484512df036421e216d4afed01beb978d33e16bb @@ -70,14 +70,23 @@ SHA1 (patch-aj) = 6318548da4c943c60fe63d41529803ea3fa2c96e SHA1 (patch-ak) = 6fb3d4444c75123dc8c5fa7bb6cea835c78ef6e3 SHA1 (patch-am) = 95f3e5a041163279f68e782469a30f6f765b7511 SHA1 (patch-an) = 3d750d5d20b2d3ab69b492eb60e27aded45ec3f7 -SHA1 (patch-ao) = 1c66024c5949269291cbf6f815baf6162db47d31 +SHA1 (patch-ao) = 1cf3dfb01314556bcb0cd61e2d0d1577e1cebc04 SHA1 (patch-ap) = af8b50c0f21e969e036064f5c808eaccc79d5c4b SHA1 (patch-aq) = 32d96ad2552d5ac914581686904e94a96e5ca059 SHA1 (patch-ar) = 727afe6de54eb244c48e99c661f6b8ae3f780de0 SHA1 (patch-at) = cd7d23adaf8882e9b431d6581283fdb58044e05c SHA1 (patch-config___arch-n-opsys) = 7035758667350aa9558a14e28245d022e43369ea +SHA1 (patch-src_runtime_c-libs_posix-filesys_stat.c) = d5a315ac342a8a59099ae9eb131c899250a2404f +SHA1 (patch-src_runtime_c-libs_posix-filesys_stat__64.c) = 2a3e1f6ffc8f688e3c2ebf8b5913481093feb0fa +SHA1 (patch-src_runtime_c-libs_posix-procenv_time.c) = 4c38da9110687b179237deef7fee389e0bbece4c +SHA1 (patch-src_runtime_c-libs_smlnj-date_mktime.c) = a3bcb173a99972ab65208f65083bb30a7e09ab67 +SHA1 (patch-src_runtime_c-libs_smlnj-runtime_gc-ctl.c) = 673d04282ef95093012a2c1e2b66d867357ee4ef +SHA1 (patch-src_runtime_gc_c-globals-tbl.c) = 19ac4ccc3ed0e784c1aeab0fe3ed781417540561 SHA1 (patch-src_runtime_gc_gc-stats.h) = af61db9d1f04e566d4c5c2bc5dcf4c6958f0ea78 +SHA1 (patch-src_runtime_gc_heap-out-util.c) = 214c673e57efda9346b200509a1beb48af2aa443 SHA1 (patch-src_runtime_gc_init-gc.c) = 5d1d5a13a51d732590dd4f375824bbc389a0525d +SHA1 (patch-src_runtime_gc_mem-writer.c) = d43974ff5e8e576490656f9d24daf66fecab4849 +SHA1 (patch-src_runtime_kernel_main.c) = db26470b16f56e93ebecc62f34aa6b7a474089ec SHA1 (patch-src_runtime_kernel_unix-timers.c) = 1c1db5bce0ec1e72adafb9380027884cf746c75c SHA1 (patch-src_runtime_mach-dep_unix-prof.c) = 90a4b81e2a8532e4e06f29bfe42c55423a0f4154 SHA1 (patch-src_runtime_objs_mk.alpha32-dunix) = 9e3a36f4663cd685459f2fbde41b8c5f154bd9c2 diff --git a/lang/smlnj11072/patches/patch-ao b/lang/smlnj11072/patches/patch-ao index 7257c87c37d..c4fed888264 100644 --- a/lang/smlnj11072/patches/patch-ao +++ b/lang/smlnj11072/patches/patch-ao @@ -1,8 +1,11 @@ -$NetBSD: patch-ao,v 1.1 2016/07/03 17:50:31 dholland Exp $ +$NetBSD: patch-ao,v 1.2 2016/07/03 19:35:36 dholland Exp $ ---- src/runtime/kernel/boot.c.orig +- use fgetc correctly +- fix uninitialized variable detected by gcc5 + +--- src/runtime/kernel/boot.c.orig 2005-11-02 22:24:39.000000000 +0000 +++ src/runtime/kernel/boot.c -@@ -124,7 +124,7 @@ +@@ -130,7 +130,7 @@ PVT ml_val_t BuildFileList (ml_state_t * ml_val_t fileList; # define SIZE_BUF_LEN 128 /* this should be plenty for two numbers */ char sizeBuf[SIZE_BUF_LEN]; @@ -11,3 +14,13 @@ $NetBSD: patch-ao,v 1.1 2016/07/03 17:50:31 dholland Exp $ numFiles = 0; +@@ -175,6 +175,9 @@ PVT ml_val_t BuildFileList (ml_state_t * + } + fclose (listF); + } ++ else { ++ *mbplp = 0; ++ } + + /* create the in-heap list */ + for (fileList = LIST_nil, i = numFiles; --i >= 0; ) { diff --git a/lang/smlnj11072/patches/patch-src_runtime_c-libs_posix-filesys_stat.c b/lang/smlnj11072/patches/patch-src_runtime_c-libs_posix-filesys_stat.c new file mode 100644 index 00000000000..99840371fa5 --- /dev/null +++ b/lang/smlnj11072/patches/patch-src_runtime_c-libs_posix-filesys_stat.c @@ -0,0 +1,40 @@ +$NetBSD: patch-src_runtime_c-libs_posix-filesys_stat.c,v 1.1 2016/07/03 19:35:36 dholland Exp $ + +Be explicit about truncating times, and avoid compiler warning. + +--- src/runtime/c-libs/posix-filesys/stat.c~ 2000-06-01 18:34:03.000000000 +0000 ++++ src/runtime/c-libs/posix-filesys/stat.c +@@ -3,6 +3,7 @@ + * COPYRIGHT (c) 1995 by AT&T Bell Laboratories. + */ + ++#include <stdint.h> + #include "ml-unixdep.h" + #include <sys/types.h> + #include <sys/stat.h> +@@ -34,6 +35,7 @@ + PVT ml_val_t mkStatRep (ml_state_t *msp, struct stat *buf) + { + int ftype; ++ int32_t tmp; + ml_val_t mode, ino, dev, uid, gid, nlink, sr, atime, mtime, ctime; + + #if ((S_IFDIR != 0x4000) || (S_IFCHR != 0x2000) || (S_IFBLK != 0x6000) || (S_IFREG != 0x8000) || (S_IFIFO != 0x1000) || (S_IFLNK != 0xA000) || (S_IFSOCK != 0xC000)) +@@ -59,9 +61,14 @@ PVT ml_val_t mkStatRep (ml_state_t *msp, + WORD_ALLOC (msp, nlink, (Word_t)(buf->st_nlink)); + WORD_ALLOC (msp, uid, (Word_t)(buf->st_uid)); + WORD_ALLOC (msp, gid, (Word_t)(buf->st_gid)); +- INT32_ALLOC (msp, atime, buf->st_atime); +- INT32_ALLOC (msp, mtime, buf->st_mtime); +- INT32_ALLOC (msp, ctime, buf->st_ctime); ++ ++ /* XXX y2038 */ ++ tmp = buf->st_atime; ++ INT32_ALLOC (msp, atime, tmp); ++ tmp = buf->st_mtime; ++ INT32_ALLOC (msp, mtime, tmp); ++ tmp = buf->st_ctime; ++ INT32_ALLOC (msp, ctime, tmp); + + /* allocate the stat record */ + ML_AllocWrite(msp, 0, MAKE_DESC(11, DTAG_record)); diff --git a/lang/smlnj11072/patches/patch-src_runtime_c-libs_posix-filesys_stat__64.c b/lang/smlnj11072/patches/patch-src_runtime_c-libs_posix-filesys_stat__64.c new file mode 100644 index 00000000000..07b324fdb04 --- /dev/null +++ b/lang/smlnj11072/patches/patch-src_runtime_c-libs_posix-filesys_stat__64.c @@ -0,0 +1,41 @@ +$NetBSD: patch-src_runtime_c-libs_posix-filesys_stat__64.c,v 1.1 2016/07/03 19:35:36 dholland Exp $ + +Be explicit about truncating times, and avoid compiler warning. + +--- src/runtime/c-libs/posix-filesys/stat_64.c.orig 2004-11-24 20:27:30.000000000 +0000 ++++ src/runtime/c-libs/posix-filesys/stat_64.c +@@ -4,6 +4,8 @@ + * + * Copyright (c) 2004 by The Fellowship of SML/NJ + */ ++ ++#include <stdint.h> + #include "ml-unixdep.h" + #include <sys/types.h> + #include <sys/stat.h> +@@ -36,6 +38,7 @@ + PVT ml_val_t mkStatRep (ml_state_t *msp, struct stat *buf) + { + int ftype; ++ int32_t tmp; + ml_val_t mode, ino, dev, uid, gid, nlink, sr, atime, mtime, ctime, + szhi, szlo; + +@@ -68,9 +71,14 @@ PVT ml_val_t mkStatRep (ml_state_t *msp, + WORD_ALLOC (msp, szhi, (Word_t)0); + } + WORD_ALLOC (msp, szlo, (Word_t)(buf->st_size)); +- INT32_ALLOC (msp, atime, buf->st_atime); +- INT32_ALLOC (msp, mtime, buf->st_mtime); +- INT32_ALLOC (msp, ctime, buf->st_ctime); ++ ++ /* XXX y2038 */ ++ tmp = buf->st_atime; ++ INT32_ALLOC (msp, atime, tmp); ++ tmp = buf->st_mtime; ++ INT32_ALLOC (msp, mtime, tmp); ++ tmp = buf->st_ctime; ++ INT32_ALLOC (msp, ctime, tmp); + + /* allocate the stat record */ + ML_AllocWrite(msp, 0, MAKE_DESC(12, DTAG_record)); diff --git a/lang/smlnj11072/patches/patch-src_runtime_c-libs_posix-procenv_time.c b/lang/smlnj11072/patches/patch-src_runtime_c-libs_posix-procenv_time.c new file mode 100644 index 00000000000..b1978b9eb06 --- /dev/null +++ b/lang/smlnj11072/patches/patch-src_runtime_c-libs_posix-procenv_time.c @@ -0,0 +1,30 @@ +$NetBSD: patch-src_runtime_c-libs_posix-procenv_time.c,v 1.1 2016/07/03 19:35:36 dholland Exp $ + +Be explicit about truncating times, and avoid compiler warning. + +--- src/runtime/c-libs/posix-procenv/time.c~ 2000-06-01 18:34:03.000000000 +0000 ++++ src/runtime/c-libs/posix-procenv/time.c +@@ -3,6 +3,7 @@ + * COPYRIGHT (c) 1995 by AT&T Bell Laboratories. + */ + ++#include <stdint.h> + #include "ml-base.h" + #include "ml-values.h" + #include "ml-objects.h" +@@ -17,11 +18,14 @@ + ml_val_t _ml_P_ProcEnv_time (ml_state_t *msp, ml_val_t arg) + { + time_t t; ++ int32_t tt; + ml_val_t res; + + t = time (NIL(time_t*)); + +- INT32_ALLOC(msp, res, t); ++ /* XXX y2038 */ ++ tt = t; ++ INT32_ALLOC(msp, res, tt); + return res; + + } /* end of _ml_P_ProcEnv_time */ diff --git a/lang/smlnj11072/patches/patch-src_runtime_c-libs_smlnj-date_mktime.c b/lang/smlnj11072/patches/patch-src_runtime_c-libs_smlnj-date_mktime.c new file mode 100644 index 00000000000..5211fad0f45 --- /dev/null +++ b/lang/smlnj11072/patches/patch-src_runtime_c-libs_smlnj-date_mktime.c @@ -0,0 +1,29 @@ +$NetBSD: patch-src_runtime_c-libs_smlnj-date_mktime.c,v 1.1 2016/07/03 19:35:36 dholland Exp $ + +Use standard headers. +Be explicit about truncating times, and avoid compiler warning. + +--- src/runtime/c-libs/smlnj-date/mktime.c~ 2007-06-01 16:19:33.000000000 +0000 ++++ src/runtime/c-libs/smlnj-date/mktime.c +@@ -3,6 +3,8 @@ + * COPYRIGHT (c) 1995 AT&T Bell Laboratories. + */ + ++#include <string.h> ++#include <stdint.h> + #include <time.h> + #include "ml-base.h" + #include "ml-c.h" +@@ -40,8 +41,11 @@ ml_val_t _ml_Date_mktime (ml_state_t *ms + } + else { + ml_val_t res; ++ /* XXX y2038 */ ++ int32_t tt; + +- INT32_ALLOC(msp, res, t); ++ tt = t; ++ INT32_ALLOC(msp, res, tt); + return res; + } + diff --git a/lang/smlnj11072/patches/patch-src_runtime_c-libs_smlnj-runtime_gc-ctl.c b/lang/smlnj11072/patches/patch-src_runtime_c-libs_smlnj-runtime_gc-ctl.c new file mode 100644 index 00000000000..855302f0b6f --- /dev/null +++ b/lang/smlnj11072/patches/patch-src_runtime_c-libs_smlnj-runtime_gc-ctl.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src_runtime_c-libs_smlnj-runtime_gc-ctl.c,v 1.1 2016/07/03 19:35:36 dholland Exp $ + +Use standard headers. + +--- src/runtime/c-libs/smlnj-runtime/gc-ctl.c~ 2005-05-05 16:25:12.000000000 +0000 ++++ src/runtime/c-libs/smlnj-runtime/gc-ctl.c +@@ -5,6 +5,7 @@ + * General interface for GC control functions. + */ + ++#include <string.h> + #include "ml-base.h" + #include "ml-values.h" + #include "ml-state.h" diff --git a/lang/smlnj11072/patches/patch-src_runtime_gc_c-globals-tbl.c b/lang/smlnj11072/patches/patch-src_runtime_gc_c-globals-tbl.c new file mode 100644 index 00000000000..77a80c0bfc6 --- /dev/null +++ b/lang/smlnj11072/patches/patch-src_runtime_gc_c-globals-tbl.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src_runtime_gc_c-globals-tbl.c,v 1.1 2016/07/03 19:35:36 dholland Exp $ + +Use standard headers. + +--- src/runtime/gc/c-globals-tbl.c~ 2000-06-01 18:34:03.000000000 +0000 ++++ src/runtime/gc/c-globals-tbl.c +@@ -6,6 +6,7 @@ + * in the ML heap (e.g., references to C functions). + */ + ++#include <string.h> + #include "ml-base.h" + #include "tags.h" + #include "ml-values.h" diff --git a/lang/smlnj11072/patches/patch-src_runtime_gc_heap-out-util.c b/lang/smlnj11072/patches/patch-src_runtime_gc_heap-out-util.c new file mode 100644 index 00000000000..92b705e885e --- /dev/null +++ b/lang/smlnj11072/patches/patch-src_runtime_gc_heap-out-util.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src_runtime_gc_heap-out-util.c,v 1.1 2016/07/03 19:35:36 dholland Exp $ + +Use standard headers. + +--- src/runtime/gc/heap-out-util.c~ 2000-06-01 18:34:03.000000000 +0000 ++++ src/runtime/gc/heap-out-util.c +@@ -5,6 +5,7 @@ + * Utility routines to export (or blast) an ML heap image. + */ + ++#include <string.h> + #include "ml-base.h" + #include "heap.h" + #include "ml-values.h" diff --git a/lang/smlnj11072/patches/patch-src_runtime_gc_mem-writer.c b/lang/smlnj11072/patches/patch-src_runtime_gc_mem-writer.c new file mode 100644 index 00000000000..0971ae32d52 --- /dev/null +++ b/lang/smlnj11072/patches/patch-src_runtime_gc_mem-writer.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src_runtime_gc_mem-writer.c,v 1.1 2016/07/03 19:35:36 dholland Exp $ + +Use standard headers. + +--- src/runtime/gc/mem-writer.c~ 2000-06-01 18:34:03.000000000 +0000 ++++ src/runtime/gc/mem-writer.c +@@ -5,6 +5,7 @@ + * An implementation of the abstract writers on top of memory regions. + */ + ++#include <string.h> + #include "ml-base.h" + #include "writer.h" + diff --git a/lang/smlnj11072/patches/patch-src_runtime_kernel_main.c b/lang/smlnj11072/patches/patch-src_runtime_kernel_main.c new file mode 100644 index 00000000000..eadc7eca9c4 --- /dev/null +++ b/lang/smlnj11072/patches/patch-src_runtime_kernel_main.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src_runtime_kernel_main.c,v 1.1 2016/07/03 19:35:36 dholland Exp $ + +Use standard headers. + +--- src/runtime/kernel/main.c~ 2005-05-05 16:25:12.000000000 +0000 ++++ src/runtime/kernel/main.c +@@ -6,6 +6,7 @@ + */ + + #include <stdio.h> ++#include <string.h> + #include <ctype.h> + #include "ml-base.h" + #include "ml-options.h" |