Sync new patches from main smlnj package; they all apply.


(dholland)

$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));

$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));

$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 */

$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;
     }
 

$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"

$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"

$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"

$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"
 

$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"