From: Nick Downing <downing.nick@gmail.com>
Date: Thu, 19 Jan 2017 10:12:45 +0000 (+1100)
Subject: Now converted all of libstdc to compile without errors under gcc
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=8c1c60d4be06125d4d3a79eb0ff704ccee50e188;p=43bsd.git

Now converted all of libstdc to compile without errors under gcc
---

diff --git a/lib/libstdc/gen.h b/lib/libstdc/gen.h
index 8f6f71d..65bf224 100644
--- a/lib/libstdc/gen.h
+++ b/lib/libstdc/gen.h
@@ -132,7 +132,7 @@ int swab __P((register char *from, register char *to, register int n));
 char *timezone __P((int zone, int dst));
 
 /* gen/valloc.c */
-char *valloc __P((int i));
+void *valloc __P((int i));
 #endif
 
 #endif
diff --git a/lib/libstdc/gen/bcopy.c b/lib/libstdc/gen/bcopy.c
index b6d1e46..c3615d2 100644
--- a/lib/libstdc/gen/bcopy.c
+++ b/lib/libstdc/gen/bcopy.c
@@ -1,6 +1,12 @@
 #include <gen.h>
 #include <sys/types.h>
 
+#ifdef X_
+#define INT intptr_t
+#else
+#define INT int
+#endif
+
 /*
  * Copyright (c) 1987 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -18,8 +24,8 @@ int bcopy(_src, _dst, length) void *_src; void *_dst; register int length; {
 #define src (*(char **)&_src)
 #define dst (*(char **)&_dst)
 	if (length && src != dst)
-		if ((u_int)dst < (u_int)src)
-			if (((int)src | (int)dst | length) & 3)
+		if (/*(u_int)*/dst < /*(u_int)*/src)
+			if (((INT)src | (INT)dst | length) & 3)
 				do	/* copy by bytes */
 					*dst++ = *src++;
 				while (--length);
@@ -32,7 +38,7 @@ int bcopy(_src, _dst, length) void *_src; void *_dst; register int length; {
 		else {			/* copy backwards */
 			src += length;
 			dst += length;
-			if (((int)src | (int)dst | length) & 3)
+			if (((INT)src | (INT)dst | length) & 3)
 				do	/* copy by bytes */
 					*--dst = *--src;
 				while (--length);
diff --git a/lib/libstdc/gen/malloc.c b/lib/libstdc/gen/malloc.c
index ca73ef2..2104b99 100644
--- a/lib/libstdc/gen/malloc.c
+++ b/lib/libstdc/gen/malloc.c
@@ -4,6 +4,12 @@
 #include <sys/proc.h>
 #include <sys/types.h>
 
+#ifdef X_
+#define INT intptr_t
+#else
+#define INT int
+#endif
+
 /*
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -111,7 +117,7 @@ void *malloc(nbytes) unsigned nbytes; {
 	if (pagesz == 0) {
 		pagesz = n = getpagesize();
 		op = (union overhead *)sbrk(0);
-  		n = n - sizeof (*op) - ((int)op & (n - 1));
+  		n = n - sizeof (*op) - ((INT)op & (n - 1));
 		if (n < 0)
 			n += pagesz;
   		if (n) {
@@ -139,7 +145,7 @@ void *malloc(nbytes) unsigned nbytes; {
 		amt = 16;	/* size of first bucket */
 		bucket = 1;
 #endif
-		n = -(sizeof (*op) + RSLOP);
+		n = -(INT)(sizeof (*op) + RSLOP);
 	} else {
 		amt = pagesz;
 		bucket = pagebucket;
@@ -207,7 +213,7 @@ void morecore(bucket) int bucket; {
 	}
 	op = (union overhead *)sbrk(amt);
 	/* no more room! */
-  	if ((int)op == -1)
+  	if ((INT)op == -1)
   		return;
 	/*
 	 * Add new memory allocated to that on
diff --git a/lib/libstdc/gen/valloc.c b/lib/libstdc/gen/valloc.c
index 3d71ca5..c488b67 100644
--- a/lib/libstdc/gen/valloc.c
+++ b/lib/libstdc/gen/valloc.c
@@ -1,6 +1,12 @@
 #include <gen.h>
 #include <sys.h>
 
+#ifdef X_
+#define INT intptr_t
+#else
+#define INT int
+#endif
+
 /*
  * Copyright (c) 1980 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -11,12 +17,13 @@
 static char sccsid[] = "@(#)valloc.c	5.2 (Berkeley) 3/9/86";
 #endif
 
-/*char	*malloc();*/
+/*void	*malloc();*/
 
-char *valloc(i) int i; {
-	int valsiz = getpagesize(), j;
+void *valloc(i) int i; {
+	int valsiz = getpagesize();
+	INT j;
 	char *cp = malloc(i + (valsiz-1));
 
-	j = ((int)cp + (valsiz-1)) &~ (valsiz-1);
+	j = ((INT)cp + (valsiz-1)) &~ (valsiz-1);
 	return ((char *)j);
 }
diff --git a/lib/libstdc/net/named/gethostnamadr.c b/lib/libstdc/net/named/gethostnamadr.c
index 43bbd74..136fc9a 100644
--- a/lib/libstdc/net/named/gethostnamadr.c
+++ b/lib/libstdc/net/named/gethostnamadr.c
@@ -12,6 +12,12 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 
+#ifdef X_
+#define U_LONG uintptr_t
+#else
+#define U_LONG u_long
+#endif
+
 /*
  * Copyright (c) 1985 Regents of the University of California.
  * All rights reserved.  The Berkeley software License Agreement
@@ -210,8 +216,9 @@ static struct hostent *getanswer(msg, msglen, iquery) char *msg; int msglen; int
 			}
 		}
 
-/* XXX should be: bp = (bp + sizeof(align) - 1) & ~sizeof(align) ??? */
-		bp += ((u_long)bp % sizeof(align));
+/* XXX bp = (char *)(((U_LONG)bp + sizeof(align) - 1) & ~sizeof(align)) */
+ abort();
+		bp += ((U_LONG)bp % sizeof(align));
 
 		if (bp + n >= &hostbuf[sizeof(hostbuf)]) {
 #ifdef DEBUG
diff --git a/lib/libstdc/oldprotos.txt b/lib/libstdc/oldprotos.txt
index f0c3453..c4819cc 100644
--- a/lib/libstdc/oldprotos.txt
+++ b/lib/libstdc/oldprotos.txt
@@ -150,7 +150,7 @@ gen/ttyslot.c:char	*rindex();
 gen/ndbm.c:static  datum makdatum();
 gen/ndbm.c:static  long hashinc();
 gen/ndbm.c:static  long dcalchash();
-gen/valloc.c:char	*malloc();
+gen/valloc.c:void	*malloc();
 gen/ecvt.c:char	*cvt();
 gen/disktab.c:static	char *dgetstr();
 gen/disktab.c:static	char *dskip();
diff --git a/lib/libstdc/post.patch b/lib/libstdc/post.patch
index 05e35c5..cec63e9 100644
--- a/lib/libstdc/post.patch
+++ b/lib/libstdc/post.patch
@@ -1,6 +1,42 @@
+diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post/gen/bcopy.c libstdc/gen/bcopy.c
+--- libstdc.post/gen/bcopy.c	2017-01-19 20:50:22.243524728 +1100
++++ libstdc/gen/bcopy.c	2017-01-19 20:58:10.784560125 +1100
+@@ -1,6 +1,12 @@
+ #include <gen.h>
+ #include <sys/types.h>
+ 
++#ifdef X_
++#define INT intptr_t
++#else
++#define INT int
++#endif
++
+ /*
+  * Copyright (c) 1987 Regents of the University of California.
+  * All rights reserved.  The Berkeley software License Agreement
+@@ -18,8 +24,8 @@
+ #define src (*(char **)&_src)
+ #define dst (*(char **)&_dst)
+ 	if (length && src != dst)
+-		if ((u_int)dst < (u_int)src)
+-			if (((int)src | (int)dst | length) & 3)
++		if (/*(u_int)*/dst < /*(u_int)*/src)
++			if (((INT)src | (INT)dst | length) & 3)
+ 				do	/* copy by bytes */
+ 					*dst++ = *src++;
+ 				while (--length);
+@@ -32,7 +38,7 @@
+ 		else {			/* copy backwards */
+ 			src += length;
+ 			dst += length;
+-			if (((int)src | (int)dst | length) & 3)
++			if (((INT)src | (INT)dst | length) & 3)
+ 				do	/* copy by bytes */
+ 					*--dst = *--src;
+ 				while (--length);
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post/gen/getpass.c libstdc/gen/getpass.c
---- libstdc.post/gen/getpass.c	2017-01-19 20:27:34.541174464 +1100
-+++ libstdc/gen/getpass.c	2017-01-19 20:27:34.549174475 +1100
+--- libstdc.post/gen/getpass.c	2017-01-19 20:50:22.243524728 +1100
++++ libstdc/gen/getpass.c	2017-01-19 20:50:22.251524742 +1100
 @@ -20,7 +20,7 @@
  	FILE *fi;
  	static char pbuf[9];
@@ -11,8 +47,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post
  	if ((fi = fdopen(open("/dev/tty", 2), "r")) == NULL)
  		fi = stdin;
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post/gen/getpwnamuid.c libstdc/gen/getpwnamuid.c
---- libstdc.post/gen/getpwnamuid.c	2017-01-19 20:27:34.541174464 +1100
-+++ libstdc/gen/getpwnamuid.c	2017-01-19 20:27:34.549174475 +1100
+--- libstdc.post/gen/getpwnamuid.c	2017-01-19 20:50:22.243524728 +1100
++++ libstdc/gen/getpwnamuid.c	2017-01-19 20:50:22.251524742 +1100
 @@ -44,19 +44,37 @@
          cp = key.dptr;
  	tp = line;
@@ -52,9 +88,22 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post
  }
  
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post/gen/malloc.c libstdc/gen/malloc.c
---- libstdc.post/gen/malloc.c	2017-01-19 20:27:34.541174464 +1100
-+++ libstdc/gen/malloc.c	2017-01-19 20:27:34.549174475 +1100
-@@ -88,9 +88,6 @@
+--- libstdc.post/gen/malloc.c	2017-01-19 20:50:22.243524728 +1100
++++ libstdc/gen/malloc.c	2017-01-19 21:05:17.993237425 +1100
+@@ -4,6 +4,12 @@
+ #include <sys/proc.h>
+ #include <sys/types.h>
+ 
++#ifdef X_
++#define INT intptr_t
++#else
++#define INT int
++#endif
++
+ /*
+  * Copyright (c) 1983 Regents of the University of California.
+  * All rights reserved.  The Berkeley software License Agreement
+@@ -88,9 +94,6 @@
  #if defined(DEBUG) || defined(RCHECK)
  #define	ASSERT(p)   if (!(p)) botch("p")
  /*#include <stdio.h>*/
@@ -64,7 +113,7 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post
  static void botch(s) char *s; {
  	fprintf(stderr, "\r\nassertion botched: %s\r\n", s);
   	(void) fflush(stderr);		/* just in case user buffered it */
-@@ -100,6 +97,8 @@
+@@ -100,6 +103,8 @@
  #define	ASSERT(p)
  #endif
  
@@ -73,9 +122,36 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post
  void *malloc(nbytes) unsigned nbytes; {
    	register union overhead *op;
    	register int bucket;
+@@ -112,7 +117,7 @@
+ 	if (pagesz == 0) {
+ 		pagesz = n = getpagesize();
+ 		op = (union overhead *)sbrk(0);
+-  		n = n - sizeof (*op) - ((int)op & (n - 1));
++  		n = n - sizeof (*op) - ((INT)op & (n - 1));
+ 		if (n < 0)
+ 			n += pagesz;
+   		if (n) {
+@@ -140,7 +145,7 @@
+ 		amt = 16;	/* size of first bucket */
+ 		bucket = 1;
+ #endif
+-		n = -(sizeof (*op) + RSLOP);
++		n = -(INT)(sizeof (*op) + RSLOP);
+ 	} else {
+ 		amt = pagesz;
+ 		bucket = pagebucket;
+@@ -208,7 +213,7 @@
+ 	}
+ 	op = (union overhead *)sbrk(amt);
+ 	/* no more room! */
+-  	if ((int)op == -1)
++  	if ((INT)op == -1)
+   		return;
+ 	/*
+ 	 * Add new memory allocated to that on
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post/gen/ndbm.c libstdc/gen/ndbm.c
---- libstdc.post/gen/ndbm.c	2017-01-19 20:27:34.541174464 +1100
-+++ libstdc/gen/ndbm.c	2017-01-19 20:27:34.549174475 +1100
+--- libstdc.post/gen/ndbm.c	2017-01-19 20:50:22.243524728 +1100
++++ libstdc/gen/ndbm.c	2017-01-19 20:50:22.251524742 +1100
 @@ -70,14 +70,14 @@
  		flags = (flags & ~03) | O_RDWR;
  	strcpy(db->dbm_pagbuf, file);
@@ -94,8 +170,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post
  	va_end(argp);
  	if (db->dbm_dirf < 0)
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post/gen/qsort.c libstdc/gen/qsort.c
---- libstdc.post/gen/qsort.c	2017-01-19 20:27:34.541174464 +1100
-+++ libstdc/gen/qsort.c	2017-01-19 20:34:36.613797634 +1100
+--- libstdc.post/gen/qsort.c	2017-01-19 20:50:22.243524728 +1100
++++ libstdc/gen/qsort.c	2017-01-19 20:50:22.251524742 +1100
 @@ -36,7 +36,7 @@
  
  static void qst __P((char *base, char *max));
@@ -106,8 +182,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post
  	register char c, *i, *j, *lo, *hi;
  	char *min, *max;
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post/gen/scandir.c libstdc/gen/scandir.c
---- libstdc.post/gen/scandir.c	2017-01-19 20:27:34.541174464 +1100
-+++ libstdc/gen/scandir.c	2017-01-19 20:35:26.941870907 +1100
+--- libstdc.post/gen/scandir.c	2017-01-19 20:50:22.243524728 +1100
++++ libstdc/gen/scandir.c	2017-01-19 20:50:22.251524742 +1100
 @@ -24,7 +24,7 @@
  /*#include <sys/stat.h>*/
  /*#include <sys/dir.h>*/
@@ -127,8 +203,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post
  	return(nitems);
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post/gen/signal.c libstdc/gen/signal.c
---- libstdc.post/gen/signal.c	2017-01-19 20:27:34.541174464 +1100
-+++ libstdc/gen/signal.c	2017-01-19 20:27:34.549174475 +1100
+--- libstdc.post/gen/signal.c	2017-01-19 20:50:22.243524728 +1100
++++ libstdc/gen/signal.c	2017-01-19 20:50:22.255524749 +1100
 @@ -15,12 +15,12 @@
   */
  /*#include <signal.h>*/
@@ -152,8 +228,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post
 +	return ((void (*) __P((int sig)))osv.sv_handler);
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post/gen/sleep.c libstdc/gen/sleep.c
---- libstdc.post/gen/sleep.c	2017-01-19 20:27:34.541174464 +1100
-+++ libstdc/gen/sleep.c	2017-01-19 20:27:34.549174475 +1100
+--- libstdc.post/gen/sleep.c	2017-01-19 20:50:22.243524728 +1100
++++ libstdc/gen/sleep.c	2017-01-19 20:50:22.255524749 +1100
 @@ -15,7 +15,7 @@
  /*#include <signal.h>*/
  
@@ -164,8 +240,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post
  static int ringring;
  
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post/gen/system.c libstdc/gen/system.c
---- libstdc.post/gen/system.c	2017-01-19 20:27:34.541174464 +1100
-+++ libstdc/gen/system.c	2017-01-19 20:27:34.549174475 +1100
+--- libstdc.post/gen/system.c	2017-01-19 20:50:22.243524728 +1100
++++ libstdc/gen/system.c	2017-01-19 20:50:22.255524749 +1100
 @@ -11,7 +11,7 @@
  
  int system(s) char *s; {
@@ -176,8 +252,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post
  	if ((pid = vfork()) == 0) {
  		execl("/bin/sh", "sh", "-c", s, 0);
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post/gen/usleep.c libstdc/gen/usleep.c
---- libstdc.post/gen/usleep.c	2017-01-19 20:27:34.541174464 +1100
-+++ libstdc/gen/usleep.c	2017-01-19 20:27:34.549174475 +1100
+--- libstdc.post/gen/usleep.c	2017-01-19 20:50:22.243524728 +1100
++++ libstdc/gen/usleep.c	2017-01-19 20:50:22.255524749 +1100
 @@ -18,7 +18,7 @@
  #define TICK	10000		/* system clock resolution in microseconds */
  
@@ -187,9 +263,38 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post
  
  static int ringring;
  
+diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post/gen/valloc.c libstdc/gen/valloc.c
+--- libstdc.post/gen/valloc.c	2017-01-19 20:50:22.243524728 +1100
++++ libstdc/gen/valloc.c	2017-01-19 20:56:33.520317785 +1100
+@@ -1,6 +1,12 @@
+ #include <gen.h>
+ #include <sys.h>
+ 
++#ifdef X_
++#define INT intptr_t
++#else
++#define INT int
++#endif
++
+ /*
+  * Copyright (c) 1980 Regents of the University of California.
+  * All rights reserved.  The Berkeley software License Agreement
+@@ -14,9 +20,10 @@
+ /*void	*malloc();*/
+ 
+ void *valloc(i) int i; {
+-	int valsiz = getpagesize(), j;
++	int valsiz = getpagesize();
++	INT j;
+ 	char *cp = malloc(i + (valsiz-1));
+ 
+-	j = ((int)cp + (valsiz-1)) &~ (valsiz-1);
++	j = ((INT)cp + (valsiz-1)) &~ (valsiz-1);
+ 	return ((char *)j);
+ }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post/gen.h libstdc/gen.h
---- libstdc.post/gen.h	2017-01-19 20:27:34.517174428 +1100
-+++ libstdc/gen.h	2017-01-19 20:34:55.509825172 +1100
+--- libstdc.post/gen.h	2017-01-19 20:50:22.223524691 +1100
++++ libstdc/gen.h	2017-01-19 20:50:22.255524749 +1100
 @@ -108,7 +108,7 @@
  char *mktemp __P((char *as));
  
@@ -199,9 +304,107 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post
  
  /* gen/random.c */
  int srandom __P((unsigned x));
+diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post/net/named/gethostnamadr.c libstdc/net/named/gethostnamadr.c
+--- libstdc.post/net/named/gethostnamadr.c	2017-01-19 20:50:22.219524684 +1100
++++ libstdc/net/named/gethostnamadr.c	2017-01-19 21:11:44.993820620 +1100
+@@ -12,6 +12,12 @@
+ #include <sys/socket.h>
+ #include <sys/types.h>
+ 
++#ifdef X_
++#define U_LONG uintptr_t
++#else
++#define U_LONG u_long
++#endif
++
+ /*
+  * Copyright (c) 1985 Regents of the University of California.
+  * All rights reserved.  The Berkeley software License Agreement
+@@ -210,8 +216,9 @@
+ 			}
+ 		}
+ 
+-/* XXX should be: bp = (bp + sizeof(align) - 1) & ~sizeof(align) ??? */
+-		bp += ((u_long)bp % sizeof(align));
++/* XXX bp = (char *)(((U_LONG)bp + sizeof(align) - 1) & ~sizeof(align)) */
++ abort();
++		bp += ((U_LONG)bp % sizeof(align));
+ 
+ 		if (bp + n >= &hostbuf[sizeof(hostbuf)]) {
+ #ifdef DEBUG
+diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post/stdio/doprnt.c libstdc/stdio/doprnt.c
+--- libstdc.post/stdio/doprnt.c	2017-01-19 20:50:22.215524676 +1100
++++ libstdc/stdio/doprnt.c	2017-01-19 20:55:18.528128815 +1100
+@@ -13,6 +13,14 @@
+ #define _va_start(argp, arg) va_start(argp)
+ #endif
+ 
++#ifdef X_
++#define LONG intptr_t
++#define U_LONG uintptr_t
++#else
++#define LONG long
++#define U_LONG u_long
++#endif
++
+ /*
+  * Copyright (c) 1988 Regents of the University of California.
+  * All rights reserved.
+@@ -79,7 +87,7 @@
+ 	register int n;		/* random handy integer */
+ 	register char *t;	/* buffer pointer */
+ 	double _double;		/* double precision arguments %[eEfgG] */
+-	u_long _ulong;		/* integer arguments %[diouxX] */
++	U_LONG _ulong;		/* integer arguments %[diouxX] */
+ 	int base;		/* base for [diouxX] conversion */
+ 	int dprec;		/* decimal precision in [diouxX] */
+ 	int fieldsz;		/* field size expanded by sign, etc */
+@@ -206,7 +214,8 @@
+ 		case 'd':
+ 		case 'i':
+ 			ARG();
+-			if ((long)_ulong < 0) {
++			if ((LONG)_ulong < 0)
++			{
+ 				_ulong = -_ulong;
+ 				sign = '-';
+ 			}
+@@ -275,7 +284,7 @@
+ 			 *	-- ANSI X3J11
+ 			 */
+ 			/* NOSTRICT */
+-			_ulong = (u_long)va_arg(argp, void *);
++			_ulong = (U_LONG)va_arg(argp, void *);
+ 			base = 16;
+ 			goto nosign;
+ 		case 's':
+diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post/stdio/findiop.c libstdc/stdio/findiop.c
+--- libstdc.post/stdio/findiop.c	2017-01-19 20:50:22.215524676 +1100
++++ libstdc/stdio/findiop.c	2017-01-19 21:02:18.292962014 +1100
+@@ -105,7 +105,7 @@
+ 			*iov = (FILE *)calloc(1, sizeof **iov);
+ }
+ 
+-void _fwalk(function) register int (*function)(); {
++void _fwalk(function) register int (*function) __P((FILE *iop)); {
+ 	register FILE **iov;
+ 	register FILE *fp;
+ 
+diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post/stdio.h libstdc/stdio.h
+--- libstdc.post/stdio.h	2017-01-19 20:50:22.227524699 +1100
++++ libstdc/stdio.h	2017-01-19 21:00:24.332785758 +1100
+@@ -109,7 +109,7 @@
+ FILE *_findiop __P((void));
+ int _f_morefiles __P((void));
+ void f_prealloc __P((void));
+-void _fwalk __P((register int (*function)(void)));
++void _fwalk __P((register int (*function) __P((FILE *iop))));
+ void _cleanup __P((void));
+ 
+ /* stdio/flsbuf.c */
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post/sys/dir.h libstdc/sys/dir.h
---- libstdc.post/sys/dir.h	2017-01-19 20:27:34.525174440 +1100
-+++ libstdc/sys/dir.h	2017-01-19 20:34:05.461752173 +1100
+--- libstdc.post/sys/dir.h	2017-01-19 20:50:22.227524699 +1100
++++ libstdc/sys/dir.h	2017-01-19 20:50:22.255524749 +1100
 @@ -122,7 +122,7 @@
  struct direct *readdir __P((register DIR *dirp));
  
@@ -212,8 +415,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post
  
  /* gen/seekdir.c */
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.post/sys/signal.h libstdc/sys/signal.h
---- libstdc.post/sys/signal.h	2017-01-19 20:27:34.525174440 +1100
-+++ libstdc/sys/signal.h	2017-01-19 20:27:34.549174475 +1100
+--- libstdc.post/sys/signal.h	2017-01-19 20:50:22.227524699 +1100
++++ libstdc/sys/signal.h	2017-01-19 20:50:22.255524749 +1100
 @@ -9,7 +9,7 @@
   *	@(#)signal.h	7.1 (Berkeley) 6/4/86
   */
diff --git a/lib/libstdc/pre.patch b/lib/libstdc/pre.patch
index 9df084e..a17ea3b 100644
--- a/lib/libstdc/pre.patch
+++ b/lib/libstdc/pre.patch
@@ -1,6 +1,6 @@
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/compat-4.1/ftime.c libstdc/compat-4.1/ftime.c
---- libstdc.pre/compat-4.1/ftime.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/compat-4.1/ftime.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/compat-4.1/ftime.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/compat-4.1/ftime.c	2017-01-19 20:49:09.099390542 +1100
 @@ -10,18 +10,20 @@
  
  #include <sys/types.h>
@@ -29,8 +29,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  ftime(tp)
  	register struct timeb *tp; {
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/compat-4.1/gtty.c libstdc/compat-4.1/gtty.c
---- libstdc.pre/compat-4.1/gtty.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/compat-4.1/gtty.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/compat-4.1/gtty.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/compat-4.1/gtty.c	2017-01-19 20:49:09.099390542 +1100
 @@ -15,7 +15,7 @@
  #include <sgtty.h>
  
@@ -41,8 +41,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  	return(ioctl(fd, TIOCGETP, ap));
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/compat-4.1/stty.c libstdc/compat-4.1/stty.c
---- libstdc.pre/compat-4.1/stty.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/compat-4.1/stty.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/compat-4.1/stty.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/compat-4.1/stty.c	2017-01-19 20:49:09.099390542 +1100
 @@ -15,7 +15,7 @@
  #include <sgtty.h>
  
@@ -53,8 +53,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  	return(ioctl(fd, TIOCSETP, ap));
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/compat-4.1/times.c libstdc/compat-4.1/times.c
---- libstdc.pre/compat-4.1/times.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/compat-4.1/times.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/compat-4.1/times.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/compat-4.1/times.c	2017-01-19 20:49:09.099390542 +1100
 @@ -10,16 +10,18 @@
  
  #include <sys/time.h>
@@ -81,8 +81,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  times(tmsp)
  	register struct tms *tmsp; {
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/compat-4.1/vtimes.c libstdc/compat-4.1/vtimes.c
---- libstdc.pre/compat-4.1/vtimes.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/compat-4.1/vtimes.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/compat-4.1/vtimes.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/compat-4.1/vtimes.c	2017-01-19 20:49:09.099390542 +1100
 @@ -10,23 +10,25 @@
  
  #include <sys/time.h>
@@ -122,8 +122,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  vtimes(par, chi)
  	register struct vtimes *par, *chi; {
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/compat-sys5/memccpy.c libstdc/compat-sys5/memccpy.c
---- libstdc.pre/compat-sys5/memccpy.c	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/compat-sys5/memccpy.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/compat-sys5/memccpy.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/compat-sys5/memccpy.c	2017-01-19 20:49:09.099390542 +1100
 @@ -13,11 +13,15 @@
  #endif
  
@@ -143,8 +143,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +#undef f
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/compat-sys5/memchr.c libstdc/compat-sys5/memchr.c
---- libstdc.pre/compat-sys5/memchr.c	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/compat-sys5/memchr.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/compat-sys5/memchr.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/compat-sys5/memchr.c	2017-01-19 20:49:09.099390542 +1100
 @@ -12,12 +12,14 @@
  static char sccsid[] = "@(#)memchr.c	5.2 (Berkeley) 86/03/09";
  #endif
@@ -164,8 +164,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +#undef s
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/compat-sys5/memcmp.c libstdc/compat-sys5/memcmp.c
---- libstdc.pre/compat-sys5/memcmp.c	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/compat-sys5/memcmp.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/compat-sys5/memcmp.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/compat-sys5/memcmp.c	2017-01-19 20:49:09.099390542 +1100
 @@ -12,11 +12,15 @@
  static char sccsid[] = "@(#)memcmp.c	5.2 (Berkeley) 86/03/09";
  #endif
@@ -185,8 +185,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +#undef s2
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/compat-sys5/memcpy.c libstdc/compat-sys5/memcpy.c
---- libstdc.pre/compat-sys5/memcpy.c	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/compat-sys5/memcpy.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/compat-sys5/memcpy.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/compat-sys5/memcpy.c	2017-01-19 20:49:09.099390542 +1100
 @@ -12,14 +12,18 @@
  static char sccsid[] = "@(#)memcpy.c	5.2 (Berkeley) 86/03/09";
  #endif
@@ -210,8 +210,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +#undef f
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/compat-sys5/memset.c libstdc/compat-sys5/memset.c
---- libstdc.pre/compat-sys5/memset.c	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/compat-sys5/memset.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/compat-sys5/memset.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/compat-sys5/memset.c	2017-01-19 20:49:09.099390542 +1100
 @@ -12,14 +12,16 @@
  static char sccsid[] = "@(#)memset.c	5.2 (Berkeley) 86/03/09";
  #endif
@@ -233,7 +233,7 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +#undef s
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/fcntl.h libstdc/fcntl.h
---- libstdc.pre/fcntl.h	2017-01-19 20:25:11.472959537 +1100
+--- libstdc.pre/fcntl.h	2017-01-19 20:49:09.091390527 +1100
 +++ libstdc/fcntl.h	1970-01-01 10:00:00.000000000 +1000
 @@ -1,40 +0,0 @@
 -/*
@@ -277,8 +277,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 -#define	FEXCL		04000		/* error if already created */
 -#endif
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/bcmp.c libstdc/gen/bcmp.c
---- libstdc.pre/gen/bcmp.c	2017-01-19 20:25:11.480959550 +1100
-+++ libstdc/gen/bcmp.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/gen/bcmp.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/gen/bcmp.c	2017-01-19 20:49:09.099390542 +1100
 @@ -11,10 +11,11 @@
  /*
   * bcmp -- vax cmpc3 instruction
@@ -302,8 +302,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +#undef b2
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/bcopy.c libstdc/gen/bcopy.c
---- libstdc.pre/gen/bcopy.c	2017-01-19 20:25:11.480959550 +1100
-+++ libstdc/gen/bcopy.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/gen/bcopy.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/gen/bcopy.c	2017-01-19 20:49:09.099390542 +1100
 @@ -11,9 +11,11 @@
  /*
   * bcopy -- vax movc3 instruction
@@ -341,8 +341,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +#undef dst
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/bzero.c libstdc/gen/bzero.c
---- libstdc.pre/gen/bzero.c	2017-01-19 20:25:11.480959550 +1100
-+++ libstdc/gen/bzero.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/gen/bzero.c	2017-01-19 20:49:09.099390542 +1100
++++ libstdc/gen/bzero.c	2017-01-19 20:49:09.099390542 +1100
 @@ -11,13 +11,14 @@
  /*
   * bzero -- vax movc5 instruction
@@ -362,8 +362,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +#undef b
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/calloc.c libstdc/gen/calloc.c
---- libstdc.pre/gen/calloc.c	2017-01-19 20:25:11.480959550 +1100
-+++ libstdc/gen/calloc.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/gen/calloc.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/gen/calloc.c	2017-01-19 20:49:09.099390542 +1100
 @@ -5,11 +5,11 @@
  /*
   * Calloc - allocate and clear memory block
@@ -389,8 +389,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  	unsigned size; {
  	free(p);
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/fakcu.c libstdc/gen/fakcu.c
---- libstdc.pre/gen/fakcu.c	2017-01-19 20:25:11.480959550 +1100
-+++ libstdc/gen/fakcu.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/gen/fakcu.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/gen/fakcu.c	2017-01-19 20:49:09.099390542 +1100
 @@ -6,5 +6,6 @@
   * Null cleanup routine to resolve reference in exit() 
   * if not using stdio.
@@ -399,8 +399,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  _cleanup() {
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/getpass.c libstdc/gen/getpass.c
---- libstdc.pre/gen/getpass.c	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/gen/getpass.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/gen/getpass.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/gen/getpass.c	2017-01-19 20:49:09.099390542 +1100
 @@ -15,8 +15,8 @@
  	register c;
  	FILE *fi;
@@ -413,8 +413,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  	if ((fi = fdopen(open("/dev/tty", 2), "r")) == NULL)
  		fi = stdin;
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/getusershell.c libstdc/gen/getusershell.c
---- libstdc.pre/gen/getusershell.c	2017-01-19 20:25:11.480959550 +1100
-+++ libstdc/gen/getusershell.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/gen/getusershell.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/gen/getusershell.c	2017-01-19 20:49:09.099390542 +1100
 @@ -62,7 +62,7 @@
  	register char **sp, *cp;
  	register FILE *fp;
@@ -434,8 +434,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  		return(okshells);
  	}
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/insque.c libstdc/gen/insque.c
---- libstdc.pre/gen/insque.c	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/gen/insque.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/gen/insque.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/gen/insque.c	2017-01-19 20:49:09.099390542 +1100
 @@ -8,16 +8,19 @@
  static char sccsid[] = "@(#)insque.c	5.1 (Berkeley) 1/27/87";
  #endif
@@ -461,7 +461,7 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  insque(e, prev)
  	register struct vaxque *e, *prev; {
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/isatty.c libstdc/gen/isatty.c
---- libstdc.pre/gen/isatty.c	2017-01-19 20:25:11.476959544 +1100
+--- libstdc.pre/gen/isatty.c	2017-01-19 20:49:09.095390534 +1100
 +++ libstdc/gen/isatty.c	1970-01-01 10:00:00.000000000 +1000
 @@ -1,17 +0,0 @@
 -#if defined(LIBC_SCCS) && !defined(lint)
@@ -482,8 +482,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 -	return(1);
 -}
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/malloc.c libstdc/gen/malloc.c
---- libstdc.pre/gen/malloc.c	2017-01-19 20:25:11.480959550 +1100
-+++ libstdc/gen/malloc.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/gen/malloc.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/gen/malloc.c	2017-01-19 20:49:09.099390542 +1100
 @@ -82,7 +82,7 @@
  #if defined(DEBUG) || defined(RCHECK)
  #define	ASSERT(p)   if (!(p)) botch("p")
@@ -542,8 +542,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  	char *s; {
    	register int i, j;
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/ndbm.c libstdc/gen/ndbm.c
---- libstdc.pre/gen/ndbm.c	2017-01-19 20:25:11.480959550 +1100
-+++ libstdc/gen/ndbm.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/gen/ndbm.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/gen/ndbm.c	2017-01-19 20:49:09.099390542 +1100
 @@ -14,6 +14,7 @@
  #include <stdio.h>
  #include <errno.h>
@@ -586,8 +586,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  		goto bad1;
  	fstat(db->dbm_dirf, &statb);
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/perror.c libstdc/gen/perror.c
---- libstdc.pre/gen/perror.c	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/gen/perror.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/gen/perror.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/gen/perror.c	2017-01-19 20:49:09.103390549 +1100
 @@ -17,7 +17,7 @@
  
  int	errno;
@@ -598,7 +598,7 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  	char *s; {
  	struct iovec iov[4];
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/popen.c libstdc/gen/popen.c
---- libstdc.pre/gen/popen.c	2017-01-19 20:25:11.480959550 +1100
+--- libstdc.pre/gen/popen.c	2017-01-19 20:49:09.095390534 +1100
 +++ libstdc/gen/popen.c	1970-01-01 10:00:00.000000000 +1000
 @@ -1,77 +0,0 @@
 -/*
@@ -679,8 +679,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 -	return (pid == -1 ? -1 : status);
 -}
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/qsort.c libstdc/gen/qsort.c
---- libstdc.pre/gen/qsort.c	2017-01-19 20:25:11.480959550 +1100
-+++ libstdc/gen/qsort.c	2017-01-19 20:26:24.113068900 +1100
+--- libstdc.pre/gen/qsort.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/gen/qsort.c	2017-01-19 20:49:09.103390549 +1100
 @@ -32,11 +32,13 @@
   * It's not...
   */
@@ -715,8 +715,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  	char *base, *max; {
  	register char c, *i, *j, *jj;
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/random.c libstdc/gen/random.c
---- libstdc.pre/gen/random.c	2017-01-19 20:25:11.480959550 +1100
-+++ libstdc/gen/random.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/gen/random.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/gen/random.c	2017-01-19 20:49:09.103390549 +1100
 @@ -222,7 +222,7 @@
  	if(  n  <  BREAK_1  )  {
  	    if(  n  <  BREAK_0  )  {
@@ -727,8 +727,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  	    rand_type = TYPE_0;
  	    rand_deg = DEG_0;
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/regex.c libstdc/gen/regex.c
---- libstdc.pre/gen/regex.c	2017-01-19 20:25:11.480959550 +1100
-+++ libstdc/gen/regex.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/gen/regex.c	2017-01-19 20:49:09.099390542 +1100
++++ libstdc/gen/regex.c	2017-01-19 20:49:09.103390549 +1100
 @@ -8,8 +8,6 @@
  static char sccsid[] = "@(#)regex.c	5.2 (Berkeley) 3/9/86";
  #endif
@@ -739,8 +739,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
   * routines to do regular expression matching
   *
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/remque.c libstdc/gen/remque.c
---- libstdc.pre/gen/remque.c	2017-01-19 20:25:11.480959550 +1100
-+++ libstdc/gen/remque.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/gen/remque.c	2017-01-19 20:49:09.099390542 +1100
++++ libstdc/gen/remque.c	2017-01-19 20:49:09.103390549 +1100
 @@ -8,16 +8,19 @@
  static char sccsid[] = "@(#)remque.c	5.1 (Berkeley) 1/27/87";
  #endif
@@ -766,8 +766,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  remque(e)
  	register struct vaxque *e; {
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/signal.c libstdc/gen/signal.c
---- libstdc.pre/gen/signal.c	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/gen/signal.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/gen/signal.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/gen/signal.c	2017-01-19 20:49:09.103390549 +1100
 @@ -13,9 +13,10 @@
   */
  #include <signal.h>
@@ -782,8 +782,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  	static int mask[NSIG];
  	static int flags[NSIG];
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/sleep.c libstdc/gen/sleep.c
---- libstdc.pre/gen/sleep.c	2017-01-19 20:25:11.480959550 +1100
-+++ libstdc/gen/sleep.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/gen/sleep.c	2017-01-19 20:49:09.099390542 +1100
++++ libstdc/gen/sleep.c	2017-01-19 20:49:09.103390549 +1100
 @@ -16,9 +16,11 @@
  
  static int ringring;
@@ -808,8 +808,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  	ringring = 1;
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/syslog.c libstdc/gen/syslog.c
---- libstdc.pre/gen/syslog.c	2017-01-19 20:25:11.480959550 +1100
-+++ libstdc/gen/syslog.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/gen/syslog.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/gen/syslog.c	2017-01-19 20:49:09.103390549 +1100
 @@ -54,6 +54,7 @@
  extern	int errno, sys_nerr;
  extern	char *sys_errlist[];
@@ -837,8 +837,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  	LogFile = -1;
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/system.c libstdc/gen/system.c
---- libstdc.pre/gen/system.c	2017-01-19 20:25:11.480959550 +1100
-+++ libstdc/gen/system.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/gen/system.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/gen/system.c	2017-01-19 20:49:09.103390549 +1100
 @@ -7,7 +7,7 @@
  system(s)
  char *s; {
@@ -849,8 +849,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  	if ((pid = vfork()) == 0) {
  		execl("/bin/sh", "sh", "-c", s, 0);
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/usleep.c libstdc/gen/usleep.c
---- libstdc.pre/gen/usleep.c	2017-01-19 20:25:11.480959550 +1100
-+++ libstdc/gen/usleep.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/gen/usleep.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/gen/usleep.c	2017-01-19 20:49:09.103390549 +1100
 @@ -19,9 +19,11 @@
  
  static int ringring;
@@ -874,9 +874,24 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 -
  	ringring = 1;
  }
+diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen/valloc.c libstdc/gen/valloc.c
+--- libstdc.pre/gen/valloc.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/gen/valloc.c	2017-01-19 20:49:33.607435604 +1100
+@@ -8,9 +8,9 @@
+ static char sccsid[] = "@(#)valloc.c	5.2 (Berkeley) 3/9/86";
+ #endif
+ 
+-char	*malloc();
++void	*malloc();
+ 
+-char *
++void *
+ valloc(i)
+ 	int i; {
+ 	int valsiz = getpagesize(), j;
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/gen.h libstdc/gen.h
 --- libstdc.pre/gen.h	1970-01-01 10:00:00.000000000 +1000
-+++ libstdc/gen.h	2017-01-19 20:25:11.484959555 +1100
++++ libstdc/gen.h	2017-01-19 20:49:09.103390549 +1100
 @@ -0,0 +1,5 @@
 +/* formerly duplicated in gen/insque.c and gen/remque.c */
 +struct vaxque {		/* queue format expected by VAX queue instructions */
@@ -884,8 +899,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +	struct vaxque	*vq_prev;
 +};
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/net/named/gethostnamadr.c libstdc/net/named/gethostnamadr.c
---- libstdc.pre/net/named/gethostnamadr.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/net/named/gethostnamadr.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/net/named/gethostnamadr.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/net/named/gethostnamadr.c	2017-01-19 20:49:09.103390549 +1100
 @@ -197,6 +197,7 @@
  			}
  		}
@@ -895,8 +910,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  
  		if (bp + n >= &hostbuf[sizeof(hostbuf)]) {
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/net/rcmd.c libstdc/net/rcmd.c
---- libstdc.pre/net/rcmd.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/net/rcmd.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/net/rcmd.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/net/rcmd.c	2017-01-19 20:49:09.103390549 +1100
 @@ -58,7 +58,7 @@
  		sin.sin_family = hp->h_addrtype;
  		bcopy(hp->h_addr_list[0], (caddr_t)&sin.sin_addr, hp->h_length);
@@ -925,8 +940,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  		if (errno != EADDRINUSE) {
  			(void) close(s);
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/net/res_debug.c libstdc/net/res_debug.c
---- libstdc.pre/net/res_debug.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/net/res_debug.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/net/res_debug.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/net/res_debug.c	2017-01-19 20:49:09.103390549 +1100
 @@ -324,7 +324,9 @@
  }
  
@@ -962,8 +977,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  	}
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/net/res_mkquery.c libstdc/net/res_mkquery.c
---- libstdc.pre/net/res_mkquery.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/net/res_mkquery.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/net/res_mkquery.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/net/res_mkquery.c	2017-01-19 20:49:09.103390549 +1100
 @@ -14,7 +14,10 @@
  #include <arpa/nameser.h>
  #include <resolv.h>
@@ -988,8 +1003,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  	/*
  	 * perform opcode specific processing
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/net/res_send.c libstdc/net/res_send.c
---- libstdc.pre/net/res_send.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/net/res_send.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/net/res_send.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/net/res_send.c	2017-01-19 20:49:09.103390549 +1100
 @@ -82,7 +82,7 @@
  #endif
  					continue;
@@ -1009,8 +1024,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  			    send(s, buf, buflen, 0) != buflen) {
  #ifdef DEBUG
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/net/rexec.c libstdc/net/rexec.c
---- libstdc.pre/net/rexec.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/net/rexec.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/net/rexec.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/net/rexec.c	2017-01-19 20:49:09.103390549 +1100
 @@ -49,7 +49,7 @@
  	sin.sin_family = hp->h_addrtype;
  	sin.sin_port = rport;
@@ -1030,8 +1045,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  		  if (s3 < 0) {
  			perror("accept");
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/net/ruserpass.c libstdc/net/ruserpass.c
---- libstdc.pre/net/ruserpass.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/net/ruserpass.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/net/ruserpass.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/net/ruserpass.c	2017-01-19 20:49:09.103390549 +1100
 @@ -19,6 +19,7 @@
  struct	utmp *getutmp();
  static	FILE *cfile;
@@ -1113,7 +1128,7 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  	register char *skey;
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/net.h libstdc/net.h
 --- libstdc.pre/net.h	1970-01-01 10:00:00.000000000 +1000
-+++ libstdc/net.h	2017-01-19 20:25:11.484959555 +1100
++++ libstdc/net.h	2017-01-19 20:49:09.103390549 +1100
 @@ -0,0 +1,16 @@
 +/* formerly duplicated in netinet/in.h and netns/ns.h */
 +/* confuses cproto which thinks #define names are types or type modifiers */
@@ -1132,8 +1147,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +u_long	ntohl(), htonl();
 +/*#endif*/
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/netinet/in.h libstdc/netinet/in.h
---- libstdc.pre/netinet/in.h	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/netinet/in.h	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/netinet/in.h	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/netinet/in.h	2017-01-19 20:49:09.103390549 +1100
 @@ -90,20 +90,21 @@
   */
  #define	IP_OPTIONS	1		/* set/get IP per-packet options */
@@ -1167,8 +1182,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  #ifdef KERNEL
  extern	struct domain inetdomain;
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/netinet/ip.h libstdc/netinet/ip.h
---- libstdc.pre/netinet/ip.h	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/netinet/ip.h	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/netinet/ip.h	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/netinet/ip.h	2017-01-19 20:49:09.103390549 +1100
 @@ -81,7 +81,7 @@
  			struct in_addr ipt_addr;
  			n_long ipt_time;
@@ -1179,8 +1194,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  
  /* flag bits for ipt_flg */
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/netinet/tcp.h libstdc/netinet/tcp.h
---- libstdc.pre/netinet/tcp.h	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/netinet/tcp.h	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/netinet/tcp.h	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/netinet/tcp.h	2017-01-19 20:49:09.103390549 +1100
 @@ -44,7 +44,9 @@
  #ifdef	lint
  #define	TCP_MSS	536
@@ -1193,8 +1208,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  
  /*
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/netns/ns.h libstdc/netns/ns.h
---- libstdc.pre/netns/ns.h	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/netns/ns.h	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/netns/ns.h	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/netns/ns.h	2017-01-19 20:49:09.103390549 +1100
 @@ -103,20 +103,21 @@
  #define ns_nullhost(x) (((x).x_host.s_host[0]==0) && \
  	((x).x_host.s_host[1]==0) && ((x).x_host.s_host[2]==0))
@@ -1228,7 +1243,7 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  #ifdef KERNEL
  extern struct domain nsdomain;
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/nlist.h libstdc/nlist.h
---- libstdc.pre/nlist.h	2017-01-19 20:25:11.472959537 +1100
+--- libstdc.pre/nlist.h	2017-01-19 20:49:09.091390527 +1100
 +++ libstdc/nlist.h	1970-01-01 10:00:00.000000000 +1000
 @@ -1,46 +0,0 @@
 -/*
@@ -1278,8 +1293,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 - */
 -#define	N_FORMAT	"%08x"
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/ns/ns_addr.c libstdc/ns/ns_addr.c
---- libstdc.pre/ns/ns_addr.c	2017-01-19 20:25:11.468959531 +1100
-+++ libstdc/ns/ns_addr.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/ns/ns_addr.c	2017-01-19 20:49:09.087390519 +1100
++++ libstdc/ns/ns_addr.c	2017-01-19 20:49:09.103390549 +1100
 @@ -54,7 +54,7 @@
  	socketname = index(hostname, separator);
  	if (socketname) {
@@ -1299,8 +1314,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  char *buf;
  u_char *out;
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/stdio/doprnt.c libstdc/stdio/doprnt.c
---- libstdc.pre/stdio/doprnt.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/stdio/doprnt.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/stdio/doprnt.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/stdio/doprnt.c	2017-01-19 20:49:09.103390549 +1100
 @@ -271,9 +271,10 @@
  				 * NUL in the first `prec' characters, and
  				 * strlen() will go further.
@@ -1315,8 +1330,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  					if (size > prec)
  						size = prec;
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/stdio/doscan.c libstdc/stdio/doscan.c
---- libstdc.pre/stdio/doscan.c	2017-01-19 20:25:11.468959531 +1100
-+++ libstdc/stdio/doscan.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/stdio/doscan.c	2017-01-19 20:49:09.087390519 +1100
++++ libstdc/stdio/doscan.c	2017-01-19 20:49:09.103390549 +1100
 @@ -3,7 +3,8 @@
  #endif
  
@@ -1397,8 +1412,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  	}
  	return(1);
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/stdio/findiop.c libstdc/stdio/findiop.c
---- libstdc.pre/stdio/findiop.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/stdio/findiop.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/stdio/findiop.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/stdio/findiop.c	2017-01-19 20:49:09.103390549 +1100
 @@ -23,7 +23,7 @@
  	{ 0, NULL, NULL, 0, _IOWRT|_IONBF,	2 },	/* stderr */
  };
@@ -1438,8 +1453,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  	extern int fclose();
  
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/stdio/fprintf.c libstdc/stdio/fprintf.c
---- libstdc.pre/stdio/fprintf.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/stdio/fprintf.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/stdio/fprintf.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/stdio/fprintf.c	2017-01-19 20:49:09.103390549 +1100
 @@ -1,31 +1,48 @@
  /*
   * Copyright (c) 1980 Regents of the University of California.
@@ -1500,8 +1515,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +	return(ferror(iop) ? EOF : len);
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/stdio/fread.c libstdc/stdio/fread.c
---- libstdc.pre/stdio/fread.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/stdio/fread.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/stdio/fread.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/stdio/fread.c	2017-01-19 20:49:09.103390549 +1100
 @@ -10,10 +10,11 @@
  
  #include	<stdio.h>
@@ -1523,8 +1538,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +#undef ptr
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/stdio/fwrite.c libstdc/stdio/fwrite.c
---- libstdc.pre/stdio/fwrite.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/stdio/fwrite.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/stdio/fwrite.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/stdio/fwrite.c	2017-01-19 20:49:09.103390549 +1100
 @@ -10,10 +10,11 @@
  
  #include	<stdio.h>
@@ -1547,7 +1562,7 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/stdio/popen.c libstdc/stdio/popen.c
 --- libstdc.pre/stdio/popen.c	1970-01-01 10:00:00.000000000 +1000
-+++ libstdc/stdio/popen.c	2017-01-19 20:25:11.484959555 +1100
++++ libstdc/stdio/popen.c	2017-01-19 20:49:09.103390549 +1100
 @@ -0,0 +1,77 @@
 +/*
 + * Copyright (c) 1980 Regents of the University of California.
@@ -1627,8 +1642,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +	return (pid == -1 ? -1 : status);
 +}
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/stdio/printf.c libstdc/stdio/printf.c
---- libstdc.pre/stdio/printf.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/stdio/printf.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/stdio/printf.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/stdio/printf.c	2017-01-19 20:49:09.103390549 +1100
 @@ -1,11 +1,35 @@
 +/*
 + * Copyright (c) 1987 Regents of the University of California.
@@ -1672,8 +1687,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +	return(ferror(stdout) ? EOF : len);
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/stdio/scanf.c libstdc/stdio/scanf.c
---- libstdc.pre/stdio/scanf.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/stdio/scanf.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/stdio/scanf.c	2017-01-19 20:49:09.087390519 +1100
++++ libstdc/stdio/scanf.c	2017-01-19 20:49:09.103390549 +1100
 @@ -2,29 +2,50 @@
  static char sccsid[] = "@(#)scanf.c	5.2 (Berkeley) 3/9/86";
  #endif
@@ -1736,8 +1751,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +	return len;
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/stdio/setbuffer.c libstdc/stdio/setbuffer.c
---- libstdc.pre/stdio/setbuffer.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/stdio/setbuffer.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/stdio/setbuffer.c	2017-01-19 20:49:09.087390519 +1100
++++ libstdc/stdio/setbuffer.c	2017-01-19 20:49:09.103390549 +1100
 @@ -33,11 +33,11 @@
  setlinebuf(iop)
  	register FILE *iop; {
@@ -1753,8 +1768,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  		setbuffer(iop, buf, BUFSIZ);
  		iop->_flag |= _IOLBF|_IOMYBUF;
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/stdio/sprintf.c libstdc/stdio/sprintf.c
---- libstdc.pre/stdio/sprintf.c	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/stdio/sprintf.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/stdio/sprintf.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/stdio/sprintf.c	2017-01-19 20:49:09.107390556 +1100
 @@ -1,17 +1,40 @@
 +/*
 + * Copyright (c) 1987 Regents of the University of California.
@@ -1805,7 +1820,7 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/stdio/vfprintf.c libstdc/stdio/vfprintf.c
 --- libstdc.pre/stdio/vfprintf.c	1970-01-01 10:00:00.000000000 +1000
-+++ libstdc/stdio/vfprintf.c	2017-01-19 20:25:11.484959555 +1100
++++ libstdc/stdio/vfprintf.c	2017-01-19 20:49:09.107390556 +1100
 @@ -0,0 +1,46 @@
 +/*
 + * Copyright (c) 1988 Regents of the University of California.
@@ -1855,7 +1870,7 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +}
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/stdio/vprintf.c libstdc/stdio/vprintf.c
 --- libstdc.pre/stdio/vprintf.c	1970-01-01 10:00:00.000000000 +1000
-+++ libstdc/stdio/vprintf.c	2017-01-19 20:25:11.484959555 +1100
++++ libstdc/stdio/vprintf.c	2017-01-19 20:49:09.107390556 +1100
 @@ -0,0 +1,33 @@
 +/*
 + * Copyright (c) 1988 Regents of the University of California.
@@ -1892,7 +1907,7 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +}
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/stdio/vsprintf.c libstdc/stdio/vsprintf.c
 --- libstdc.pre/stdio/vsprintf.c	1970-01-01 10:00:00.000000000 +1000
-+++ libstdc/stdio/vsprintf.c	2017-01-19 20:25:11.484959555 +1100
++++ libstdc/stdio/vsprintf.c	2017-01-19 20:49:09.107390556 +1100
 @@ -0,0 +1,38 @@
 +/*
 + * Copyright (c) 1988 Regents of the University of California.
@@ -1933,8 +1948,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +	return (len);
 +}
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/stdio.h libstdc/stdio.h
---- libstdc.pre/stdio.h	2017-01-19 20:25:11.472959537 +1100
-+++ libstdc/stdio.h	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/stdio.h	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/stdio.h	2017-01-19 20:49:09.107390556 +1100
 @@ -59,7 +59,7 @@
  long	ftell();
  char	*fgets();
@@ -1945,8 +1960,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  #endif
  # endif
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/dir.h libstdc/sys/dir.h
---- libstdc.pre/sys/dir.h	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/sys/dir.h	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/sys/dir.h	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/sys/dir.h	2017-01-19 20:49:09.107390556 +1100
 @@ -32,9 +32,9 @@
   * dp->d_ino set to 0.
   */
@@ -1961,8 +1976,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  #define	MAXNAMLEN	255
  
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/execl.c libstdc/sys/execl.c
---- libstdc.pre/sys/execl.c	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/sys/execl.c	2017-01-19 20:25:11.484959555 +1100
+--- libstdc.pre/sys/execl.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/sys/execl.c	2017-01-19 20:49:09.107390556 +1100
 @@ -1,3 +1,4 @@
 -void execl(f, a) char *f, *a; {
 +#include <varargs.h>
@@ -1970,8 +1985,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
    abort();
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/execle.c libstdc/sys/execle.c
---- libstdc.pre/sys/execle.c	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/sys/execle.c	2017-01-19 20:25:11.488959561 +1100
+--- libstdc.pre/sys/execle.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/sys/execle.c	2017-01-19 20:49:09.107390556 +1100
 @@ -1,3 +1,4 @@
 -void execle(f, a) char *f, *a; {
 +#include <varargs.h>
@@ -1979,8 +1994,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
    abort();
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/ioctl.c libstdc/sys/ioctl.c
---- libstdc.pre/sys/ioctl.c	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/sys/ioctl.c	2017-01-19 20:25:11.488959561 +1100
+--- libstdc.pre/sys/ioctl.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/sys/ioctl.c	2017-01-19 20:49:09.107390556 +1100
 @@ -1,3 +1,3 @@
 -int ioctl(d, r, p) u_long r; char *p; {
 +int ioctl(d, r, p) u_long r; void *p; {
@@ -1988,7 +2003,7 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/isatty.c libstdc/sys/isatty.c
 --- libstdc.pre/sys/isatty.c	1970-01-01 10:00:00.000000000 +1000
-+++ libstdc/sys/isatty.c	2017-01-19 20:25:11.488959561 +1100
++++ libstdc/sys/isatty.c	2017-01-19 20:49:09.107390556 +1100
 @@ -0,0 +1,17 @@
 +#if defined(LIBC_SCCS) && !defined(lint)
 +static char sccsid[] = "@(#)isatty.c	5.2 (Berkeley) 3/9/86";
@@ -2008,8 +2023,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +	return(1);
 +}
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/open.c libstdc/sys/open.c
---- libstdc.pre/sys/open.c	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/sys/open.c	2017-01-19 20:25:11.488959561 +1100
+--- libstdc.pre/sys/open.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/sys/open.c	2017-01-19 20:49:09.107390556 +1100
 @@ -1,3 +1,4 @@
 -int open(f, m, stuff) char *f; {
 +#include <varargs.h>
@@ -2017,8 +2032,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
    abort();
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/param.h libstdc/sys/param.h
---- libstdc.pre/sys/param.h	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/sys/param.h	2017-01-19 20:25:11.488959561 +1100
+--- libstdc.pre/sys/param.h	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/sys/param.h	2017-01-19 20:49:09.107390556 +1100
 @@ -53,15 +53,16 @@
  /*
   * Signals
@@ -2065,8 +2080,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +/* moved this from sys/types.h */
 +#define	NBBY	8		/* number of bits in a byte */
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/proc.h libstdc/sys/proc.h
---- libstdc.pre/sys/proc.h	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/sys/proc.h	2017-01-19 20:25:11.488959561 +1100
+--- libstdc.pre/sys/proc.h	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/sys/proc.h	2017-01-19 20:49:09.107390556 +1100
 @@ -117,3 +117,8 @@
  #define	SSEL	0x0400000	/* selecting; wakeup/waiting danger */
  #define	SLOGIN	0x0800000	/* a login process (legit child of init) */
@@ -2077,24 +2092,24 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +	((p)->p_sig && ((p)->p_flag&STRC || \
 +	 ((p)->p_sig &~ ((p)->p_sigignore | (p)->p_sigmask))) && issig())
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/read.c libstdc/sys/read.c
---- libstdc.pre/sys/read.c	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/sys/read.c	2017-01-19 20:25:11.488959561 +1100
+--- libstdc.pre/sys/read.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/sys/read.c	2017-01-19 20:49:09.107390556 +1100
 @@ -1,3 +1,3 @@
 -int read(f, b, l) char *b; {
 +int read(f, b, l) void *b; {
    abort();
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/recv.c libstdc/sys/recv.c
---- libstdc.pre/sys/recv.c	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/sys/recv.c	2017-01-19 20:25:11.488959561 +1100
+--- libstdc.pre/sys/recv.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/sys/recv.c	2017-01-19 20:49:09.107390556 +1100
 @@ -1,3 +1,3 @@
 -int recv(s, b, l, f) char *b; {
 +int recv(s, b, l, f) void *b; {
    abort();
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/recvfrom.c libstdc/sys/recvfrom.c
---- libstdc.pre/sys/recvfrom.c	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/sys/recvfrom.c	2017-01-19 20:25:11.488959561 +1100
+--- libstdc.pre/sys/recvfrom.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/sys/recvfrom.c	2017-01-19 20:49:09.107390556 +1100
 @@ -1,3 +1,3 @@
 -int recvfrom(s, b, l, f, fr, fl) char *b; struct sockaddr *fr; int *fl; {
 +int recvfrom(s, b, l, f, fr, fl) void *b; struct sockaddr *fr; int *fl; {
@@ -2102,7 +2117,7 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/select.h libstdc/sys/select.h
 --- libstdc.pre/sys/select.h	1970-01-01 10:00:00.000000000 +1000
-+++ libstdc/sys/select.h	2017-01-19 20:25:11.488959561 +1100
++++ libstdc/sys/select.h	2017-01-19 20:49:09.107390556 +1100
 @@ -0,0 +1,28 @@
 +#include <sys/param.h>
 +
@@ -2133,24 +2148,24 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +#define	FD_ISSET(n, p)	((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS)))
 +#define FD_ZERO(p)	bzero((char *)(p), sizeof(*(p)))
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/send.c libstdc/sys/send.c
---- libstdc.pre/sys/send.c	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/sys/send.c	2017-01-19 20:25:11.488959561 +1100
+--- libstdc.pre/sys/send.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/sys/send.c	2017-01-19 20:49:09.107390556 +1100
 @@ -1,3 +1,3 @@
 -int send(s, m, l, f) char *m; {
 +int send(s, m, l, f) void *m; {
    abort();
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/sendto.c libstdc/sys/sendto.c
---- libstdc.pre/sys/sendto.c	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/sys/sendto.c	2017-01-19 20:25:11.488959561 +1100
+--- libstdc.pre/sys/sendto.c	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/sys/sendto.c	2017-01-19 20:49:09.107390556 +1100
 @@ -1,3 +1,3 @@
 -int sendto(s, m, l, f, t, tl) char *m; struct sockaddr *t; {
 +int sendto(s, m, l, f, t, tl) void *m; struct sockaddr *t; {
    abort();
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/signal.h libstdc/sys/signal.h
---- libstdc.pre/sys/signal.h	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/sys/signal.h	2017-01-19 20:25:11.488959561 +1100
+--- libstdc.pre/sys/signal.h	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/sys/signal.h	2017-01-19 20:49:09.107390556 +1100
 @@ -57,14 +57,14 @@
  #define SIGUSR2 31	/* user defined signal 2 */
  
@@ -2188,8 +2203,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  #endif
  
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/tty.h libstdc/sys/tty.h
---- libstdc.pre/sys/tty.h	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/sys/tty.h	2017-01-19 20:25:11.488959561 +1100
+--- libstdc.pre/sys/tty.h	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/sys/tty.h	2017-01-19 20:49:09.107390556 +1100
 @@ -70,20 +70,22 @@
  	struct	ttychars t_chars;	/* tty */
  	struct	winsize t_winsize;	/* window size */
@@ -2228,8 +2243,8 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  
  #define	TTIPRI	28
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/types.h libstdc/sys/types.h
---- libstdc.pre/sys/types.h	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/sys/types.h	2017-01-19 20:25:11.488959561 +1100
+--- libstdc.pre/sys/types.h	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/sys/types.h	2017-01-19 20:49:09.107390556 +1100
 @@ -45,30 +45,32 @@
  typedef	u_short	uid_t;
  typedef	u_short	gid_t;
@@ -2281,14 +2296,14 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
  #endif
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/vfork.c libstdc/sys/vfork.c
 --- libstdc.pre/sys/vfork.c	1970-01-01 10:00:00.000000000 +1000
-+++ libstdc/sys/vfork.c	2017-01-19 20:25:11.488959561 +1100
++++ libstdc/sys/vfork.c	2017-01-19 20:49:09.107390556 +1100
 @@ -0,0 +1,3 @@
 +int vfork() {
 +  abort();
 +}
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/vmmac.h libstdc/sys/vmmac.h
---- libstdc.pre/sys/vmmac.h	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/sys/vmmac.h	2017-01-19 20:25:11.488959561 +1100
+--- libstdc.pre/sys/vmmac.h	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/sys/vmmac.h	2017-01-19 20:49:09.107390556 +1100
 @@ -157,3 +157,10 @@
  	} \
  	c->c_lock = 0; \
@@ -2302,31 +2317,31 @@ diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/
 +	(*(int *)(pte) = (pfnum) | (prot), mtpr(TBIS, ptob(v)))
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/vopen.c libstdc/sys/vopen.c
 --- libstdc.pre/sys/vopen.c	1970-01-01 10:00:00.000000000 +1000
-+++ libstdc/sys/vopen.c	2017-01-19 20:25:11.488959561 +1100
++++ libstdc/sys/vopen.c	2017-01-19 20:49:09.107390556 +1100
 @@ -0,0 +1,4 @@
 +#include <varargs.h>
 +int vopen(f, m, argp) char *f; va_list argp; {
 +  abort();
 +}
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/wait.c libstdc/sys/wait.c
---- libstdc.pre/sys/wait.c	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/sys/wait.c	2017-01-19 20:25:11.488959561 +1100
+--- libstdc.pre/sys/wait.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/sys/wait.c	2017-01-19 20:49:09.107390556 +1100
 @@ -1,3 +1,3 @@
 -int wait(s) union wait *s; {
 +int wait(s) int *s; {
    abort();
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/sys/write.c libstdc/sys/write.c
---- libstdc.pre/sys/write.c	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/sys/write.c	2017-01-19 20:25:11.488959561 +1100
+--- libstdc.pre/sys/write.c	2017-01-19 20:49:09.091390527 +1100
++++ libstdc/sys/write.c	2017-01-19 20:49:09.107390556 +1100
 @@ -1,3 +1,3 @@
 -int write(f, b, l) char *b; {
 +int write(f, b, l) void *b; {
    abort();
  }
 diff --unified --recursive --new-file '--exclude=*.o' '--exclude=x' libstdc.pre/vax/vmparam.h libstdc/vax/vmparam.h
---- libstdc.pre/vax/vmparam.h	2017-01-19 20:25:11.476959544 +1100
-+++ libstdc/vax/vmparam.h	2017-01-19 20:25:11.488959561 +1100
+--- libstdc.pre/vax/vmparam.h	2017-01-19 20:49:09.095390534 +1100
++++ libstdc/vax/vmparam.h	2017-01-19 20:49:09.107390556 +1100
 @@ -156,5 +156,6 @@
  /*
   * BEWARE THIS DEFINITION WORKS ONLY WITH COUNT OF 1
diff --git a/lib/libstdc/stdio.h b/lib/libstdc/stdio.h
index 76125b9..c90603e 100644
--- a/lib/libstdc/stdio.h
+++ b/lib/libstdc/stdio.h
@@ -109,7 +109,7 @@ int _filbuf __P((register FILE *iop));
 FILE *_findiop __P((void));
 int _f_morefiles __P((void));
 void f_prealloc __P((void));
-void _fwalk __P((register int (*function)(void)));
+void _fwalk __P((register int (*function) __P((FILE *iop))));
 void _cleanup __P((void));
 
 /* stdio/flsbuf.c */
diff --git a/lib/libstdc/stdio/doprnt.c b/lib/libstdc/stdio/doprnt.c
index 308addc..c710f41 100644
--- a/lib/libstdc/stdio/doprnt.c
+++ b/lib/libstdc/stdio/doprnt.c
@@ -13,6 +13,14 @@
 #define _va_start(argp, arg) va_start(argp)
 #endif
 
+#ifdef X_
+#define LONG intptr_t
+#define U_LONG uintptr_t
+#else
+#define LONG long
+#define U_LONG u_long
+#endif
+
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -79,7 +87,7 @@ int _doprnt(fmt0, argp, fp) u_char *fmt0; va_list argp; register FILE *fp; {
 	register int n;		/* random handy integer */
 	register char *t;	/* buffer pointer */
 	double _double;		/* double precision arguments %[eEfgG] */
-	u_long _ulong;		/* integer arguments %[diouxX] */
+	U_LONG _ulong;		/* integer arguments %[diouxX] */
 	int base;		/* base for [diouxX] conversion */
 	int dprec;		/* decimal precision in [diouxX] */
 	int fieldsz;		/* field size expanded by sign, etc */
@@ -206,7 +214,8 @@ rflag:		switch (*++fmt) {
 		case 'd':
 		case 'i':
 			ARG();
-			if ((long)_ulong < 0) {
+			if ((LONG)_ulong < 0)
+			{
 				_ulong = -_ulong;
 				sign = '-';
 			}
@@ -275,7 +284,7 @@ rflag:		switch (*++fmt) {
 			 *	-- ANSI X3J11
 			 */
 			/* NOSTRICT */
-			_ulong = (u_long)va_arg(argp, void *);
+			_ulong = (U_LONG)va_arg(argp, void *);
 			base = 16;
 			goto nosign;
 		case 's':
diff --git a/lib/libstdc/stdio/findiop.c b/lib/libstdc/stdio/findiop.c
index fbd0770..3dfb9ff 100644
--- a/lib/libstdc/stdio/findiop.c
+++ b/lib/libstdc/stdio/findiop.c
@@ -105,7 +105,7 @@ void f_prealloc() {
 			*iov = (FILE *)calloc(1, sizeof **iov);
 }
 
-void _fwalk(function) register int (*function)(); {
+void _fwalk(function) register int (*function) __P((FILE *iop)); {
 	register FILE **iov;
 	register FILE *fp;
 
diff --git a/x_include/x_.h b/x_include/x_.h
index 1d112a3..4af0208 100644
--- a/x_include/x_.h
+++ b/x_include/x_.h
@@ -15,4 +15,7 @@ typedef unsigned short x_unsigned_short;
 typedef unsigned int x_unsigned_int;
 typedef unsigned int x_unsigned_long;
 
+typedef long long intptr_t;
+typedef unsigned long long uintptr_t;
+
 #endif
diff --git a/x_include/x_gen.h b/x_include/x_gen.h
index 264cec9..aa76c32 100644
--- a/x_include/x_gen.h
+++ b/x_include/x_gen.h
@@ -134,7 +134,7 @@ x_int x_swab __P((register char *x_from, register char *x_to, register x_int x_n
 char *x_timezone __P((x_int x_zone, x_int x_dst));
 
 /* gen/valloc.c */
-char *x_valloc __P((x_int x_i));
+void *x_valloc __P((x_int x_i));
 #endif
 
 #endif
diff --git a/x_include/x_stdio.h b/x_include/x_stdio.h
index ae89111..c025247 100644
--- a/x_include/x_stdio.h
+++ b/x_include/x_stdio.h
@@ -111,7 +111,7 @@ x_int x__filbuf __P((register x_FILE *x_iop));
 x_FILE *x__findiop __P((void));
 x_int x__f_morefiles __P((void));
 void x_f_prealloc __P((void));
-void x__fwalk __P((register x_int (*x_function)(void)));
+void x__fwalk __P((register x_int (*x_function) __P((x_FILE *x_iop))));
 void x__cleanup __P((void));
 
 /* stdio/flsbuf.c */
diff --git a/xify/x_.h b/xify/x_.h
index 1d112a3..4af0208 100644
--- a/xify/x_.h
+++ b/xify/x_.h
@@ -15,4 +15,7 @@ typedef unsigned short x_unsigned_short;
 typedef unsigned int x_unsigned_int;
 typedef unsigned int x_unsigned_long;
 
+typedef long long intptr_t;
+typedef unsigned long long uintptr_t;
+
 #endif
diff --git a/xify/xify.c b/xify/xify.c
index 83603c7..1888877 100644
--- a/xify/xify.c
+++ b/xify/xify.c
@@ -98,6 +98,7 @@ int main() {
               (m != 4 || memcmp(q, "long", 4) != 0) &&
               (m != 5 || memcmp(q, "short", 5) != 0) &&
               (m != 6 || memcmp(q, "struct", 6) != 0) &&
+              (m != 9 || memcmp(q, "uintptr_t", 9) != 0) &&
               (m != 5 || memcmp(q, "union", 5) != 0) &&
               (m != 8 || memcmp(q, "unsigned", 8) != 0) &&
               (m != 7 || memcmp(q, "va_list", 7) != 0) &&
@@ -212,6 +213,7 @@ int main() {
           (l != 6 || memcmp(p, "struct", 6) != 0) &&
           (l != 6 || memcmp(p, "switch", 6) != 0) &&
           (l != 7 || memcmp(p, "typedef", 7) != 0) &&
+          (l != 9 || memcmp(p, "uintptr_t", 9) != 0) &&
           (l != 5 || memcmp(p, "union", 5) != 0) &&
           (l != 8 || memcmp(p, "va_alist", 8) != 0) &&
           (l != 6 || memcmp(p, "va_arg", 6) != 0) &&
diff --git a/xify/xify.sh b/xify/xify.sh
index c2e10c0..5fb07f7 100755
--- a/xify/xify.sh
+++ b/xify/xify.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 "`dirname "$0"`/xify" |\
-sed -e 's/\(extern\|register\|static\) x_int x_u_\(short\|int\|long\)/\1 x_u_\2/g; s/va_arg(x_argp, x_\(unsigned_\)\?\(short\|int\|long\))/_va_arg_\1\2(x_argp)/g'
+sed -e 's/\(extern\|register\|static\) x_int x_\(datum\|u_short\|u_int\|u_long\)/\1 x_\2/g; s/va_arg(x_argp, x_\(unsigned_\)\?\(short\|int\|long\))/_va_arg_\1\2(x_argp)/g'