NetBSD re-synchronization of the source tree

This brings our tree to NetBSD 7.0, as found on -current on the
10-10-2015.

This updates:
 - LLVM to 3.6.1
 - GCC to GCC 5.1
 - Replace minix/commands/zdump with usr.bin/zdump
 - external/bsd/libelf has moved to /external/bsd/elftoolchain/
 - Import ctwm
 - Drop sprintf from libminc

Change-Id: I149836ac18e9326be9353958bab9b266efb056f0

tools/compat/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.69 2013/08/06 22:04:25 apb Exp $
+#	$NetBSD: Makefile,v 1.76 2015/09/17 14:25:43 christos Exp $
 
 HOSTLIB=	nbcompat
 
@@ -13,14 +13,17 @@ SRCS=		atoll.c basename.c cdbr.c cdbw.c dirname.c \
 		mi_vector_hash.c mkdtemp.c \
 		mkstemp.c pread.c putc_unlocked.c pwcache.c pwrite.c \
 		pw_scan.c \
-		raise_default_signal.c rmd160.c rmd160hl.c \
+		raise_default_signal.c reallocarr.c rmd160.c rmd160hl.c \
 		setenv.c setgroupent.c \
 		setpassent.c setprogname.c sha1.c sha1hl.c sha2.c \
 		sha256hl.c sha384hl.c sha512hl.c snprintb.c snprintf.c \
-		stat_flags.c strlcat.c strlcpy.c strmode.c strndup.c \
+		stat_flags.c strlcat.c strlcpy.c strmode.c \
+		strndup.c strnlen.c \
 		strsep.c strsuftoll.c strtoll.c \
-		unvis.c vis.c err.c errx.c verr.c verrx.c \
-		vwarn.c vwarnx.c warn.c warnx.c fts.c glob.c efun.c
+		strtoi.c strtou.c \
+		unvis.c vis.c err.c errx.c errc.c verr.c verrx.c verrc.c \
+		vwarn.c vwarnx.c vwarnc.c warn.c warnx.c warnc.c \
+		fts.c glob.c efun.c
 
 BUILD_OSTYPE!=  uname -s
 
@@ -48,6 +51,7 @@ CPPFLAGS+=	-I. -I./include -I${.CURDIR} -I${.CURDIR}/sys \
 		${.CURDIR}/../../lib/libc/stdlib \
 		${.CURDIR}/../../lib/libc/string \
 		${.CURDIR}/../../lib/libutil \
+		${.CURDIR}/../../common/lib/libc/cdb \
 		${.CURDIR}/../../common/lib/libc/string \
 		${.CURDIR}/../../common/lib/libc/hash/rmd160 \
 		${.CURDIR}/../../common/lib/libc/hash/sha1 \

tools/compat/cdbr.h

@@ -1,5 +1,5 @@
-/*	$NetBSD: cdbr.h,v 1.1 2012/06/04 19:06:45 joerg Exp $	*/
+/*	$NetBSD: cdbr.h,v 1.2 2013/12/11 01:24:08 joerg Exp $	*/
 
 /* We unconditionally use the NetBSD cdbr(3) in libnbcompat. */
 #include "nbtool_config.h"
-#include "../../include/cdbr.h"
+#include "../../sys/sys/cdbr.h"

tools/compat/compat_defs.h

@@ -1,32 +1,34 @@
-/*	$NetBSD: compat_defs.h,v 1.93 2013/10/24 13:59:47 apb Exp $	*/
+/*	$NetBSD: compat_defs.h,v 1.103 2015/09/21 21:50:16 pooka Exp $	*/
 
 #ifndef	__NETBSD_COMPAT_DEFS_H__
 #define	__NETBSD_COMPAT_DEFS_H__
 
-
-/* Work around some complete brain damage. */
 /*
- * Linux: <features.h> turns on _POSIX_SOURCE by default, even though the
- * program (not the OS) should do that.  Preload <features.h> to keep any
- * of this crap from being pulled in, and undefine _POSIX_SOURCE.
+ * On NetBSD, ensure that _NETBSD_SOURCE does not get defined, so that
+ * accidental attempts to use NetBSD-specific features instead of more
+ * portable features is likely to be noticed when the tools are built
+ * on NetBSD.  Define enough other feature test macros to expose the
+ * features we need.
  */
-
-#if defined(__linux__) && HAVE_FEATURES_H
-#include <features.h>
-#define __USE_ISOC99 1
-#endif
-
-/* So _NETBSD_SOURCE doesn't end up defined. Define enough to pull in standard
-   defs. Other platforms may need similiar defines. */
-#if defined(__NetBSD__) || defined(__minix)
+#ifdef __NetBSD__
 #define	_ISOC99_SOURCE
 #define _POSIX_SOURCE	1
 #define _POSIX_C_SOURCE	200112L
 #define _XOPEN_SOURCE 600
-#else
+#endif /* __NetBSD__ */
+
+/*
+ * Linux: <features.h> turns on _POSIX_SOURCE by default, even though the
+ * program (not the OS) should do that.  Preload <features.h> and
+ * then override some of the feature test macros.
+ */
+
+#if defined(__linux__) && HAVE_FEATURES_H
+#include <features.h>
 #undef _POSIX_SOURCE
 #undef _POSIX_C_SOURCE
-#endif
+#define __USE_ISOC99 1
+#endif	/* __linux__ && HAVE_FEATURES_H */
 
 /* System headers needed for (re)definitions below. */
 
@@ -75,6 +77,11 @@
 #undef __UNCONST
 #endif
 #define __UNCONST(a)   ((void *)(unsigned long)(const void *)(a))
+#ifdef __UNVOLATILE
+#undef __UNVOLATILE
+#endif
+#define __UNVOLATILE(a)        ((void *)(unsigned long)(volatile void *)(a))
+
 
 #undef __predict_false
 #define __predict_false(x) (x)
@@ -99,7 +106,7 @@ struct group;
 #define __END_DECLS
 #endif
 
-/* Some things usually in BSD <sys/cdefs.h>. */
+/* Some things in NetBSD <sys/cdefs.h>. */
 
 #ifndef __CONCAT
 #define	__CONCAT(x,y)	x ## y
@@ -135,6 +142,20 @@ struct group;
 #define	__arraycount(__x)	(sizeof(__x) / sizeof(__x[0]))
 #undef __USE
 #define __USE(a) ((void)(a))
+#undef __type_min_s
+#define __type_min_s(t) ((t)((1ULL << (sizeof(t) * NBBY - 1))))
+#undef __type_max_s
+#define __type_max_s(t) ((t)~((1ULL << (sizeof(t) * NBBY - 1))))
+#undef __type_min_u
+#define __type_min_u(t) ((t)0ULL)
+#undef __type_max_u
+#define __type_max_u(t) ((t)~0ULL)
+#undef __type_is_signed
+#define __type_is_signed(t) (/*LINTED*/__type_min_s(t) + (t)1 < (t)1)
+#undef __type_min
+#define __type_min(t) (__type_is_signed(t) ? __type_min_s(t) : __type_min_u(t))
+#undef __type_max
+#define __type_max(t) (__type_is_signed(t) ? __type_max_s(t) : __type_max_u(t))
 
 /* Dirent support. */
 
@@ -258,6 +279,18 @@ void warn(const char *, ...);
 void warnx(const char *, ...);
 void vwarnx(const char *, va_list);
 #endif
+#if !HAVE_DECL_WARNC
+void warnc(int, const char *, ...);
+#endif
+#if !HAVE_DECL_VWARNC
+void vwarnc(int, const char *, va_list);
+#endif
+#if !HAVE_DECL_ERRC
+void errc(int, int, const char *, ...);
+#endif
+#if !HAVE_DECL_VERRC
+void verrc(int, int, const char *, va_list);
+#endif
 
 #if !HAVE_ESETFUNC
 void (*esetfunc(void (*)(int, const char *, ...)))(int, const char *, ...);
@@ -415,6 +448,9 @@ int pwcache_groupdb(int (*)(int), void (*)(void),
 #if !HAVE_DECL_STRNDUP
 char		*strndup(const char *, size_t);
 #endif
+#if !HAVE_DECL_STRNLEN
+size_t		strnlen(const char *, size_t);
+#endif
 #if !HAVE_DECL_LCHFLAGS
 int		lchflags(const char *, unsigned long);
 #endif
@@ -433,6 +469,10 @@ ssize_t pwrite(int, const void *, size_t, off_t);
 int raise_default_signal(int);
 #endif
 
+#if !HAVE_REALLOCARR
+int reallocarr(void *, size_t, size_t);
+#endif
+
 #if !HAVE_SETENV
 int setenv(const char *, const char *, int);
 #endif
@@ -489,6 +529,16 @@ long long strsuftollx(const char *, const char *,
 long long strtoll(const char *, char **, int);
 #endif
 
+#if !HAVE_STRTOI
+intmax_t strtoi(const char * __restrict, char ** __restrict, int,
+    intmax_t, intmax_t, int *);
+#endif
+
+#if !HAVE_STRTOU
+uintmax_t strtou(const char * __restrict, char ** __restrict, int,
+    uintmax_t, uintmax_t, int *);
+#endif
+
 #if !HAVE_USER_FROM_UID
 const char *user_from_uid(uid_t, int);
 #endif
@@ -562,6 +612,9 @@ void *setmode(const char *);
 #ifndef O_SHLOCK
 #define O_SHLOCK 0
 #endif
+#ifndef O_CLOEXEC
+#define O_CLOEXEC 0
+#endif
 
 /* <inttypes.h> */
 
@@ -857,6 +910,13 @@ void *setmode(const char *);
 #define LLONG_MIN ((long long)(~LLONG_MAX))
 #endif
 
+#ifndef MAXPATHLEN
+#define MAXPATHLEN	4096
+#endif
+#ifndef PATH_MAX
+#define PATH_MAX	MAXPATHLEN
+#endif
+
 /* <paths.h> */
 
 /* The host's _PATH_BSHELL might be broken, so override it. */
@@ -1096,6 +1156,9 @@ __GEN_ENDIAN_DEC(64, le)
 #ifndef MAXPHYS
 #define MAXPHYS (64 * 1024)
 #endif
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN	256
+#endif
 
 /* XXX needed by makefs; this should be done in a better way */
 #undef btodb

tools/compat/configure.ac

@@ -1,4 +1,4 @@
-#	$NetBSD: configure.ac,v 1.80 2013/08/14 10:14:45 jmcneill Exp $
+#	$NetBSD: configure.ac,v 1.84 2015/07/26 14:01:53 kamil Exp $
 #
 # Autoconf definition file for libnbcompat.
 #
@@ -37,7 +37,7 @@ AC_DEFUN([AC_NETBSD],
       AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
       AC_MSG_CHECKING([for NetBSD or MINIX3])
       AC_EGREP_CPP(yes,
-      [#if defined(__NetBSD__) || ((__minix)
+      [#if defined(__NetBSD__) || defined(__minix)
 	yes
 	#endif
 	],
@@ -157,10 +157,10 @@ AC_CHECK_FUNCS(atoll asprintf asnprintf basename devname dirfd dirname \
 	getopt getopt_long group_from_gid gid_from_group \
 	heapsort isblank issetugid lchflags lchmod lchown lutimes mkstemp \
 	mkdtemp poll pread putc_unlocked pwcache_userdb pwcache_groupdb \
-	pwrite raise_default_signal random setenv \
+	pwrite raise_default_signal random reallocarr setenv \
 	setgroupent setprogname setpassent \
 	snprintb_m snprintf strlcat strlcpy strmode \
-	strndup strsep strsuftoll strtoll \
+	strndup strnlen strsep strsuftoll strtoi strtoll strtou \
 	user_from_uid uid_from_user vasprintf vasnprintf vsnprintf)
 
 AC_CHECK_DECLS([user_from_uid, uid_from_user, pwcache_userdb],,,[
@@ -169,13 +169,19 @@ AC_CHECK_DECLS([user_from_uid, uid_from_user, pwcache_userdb],,,[
 AC_CHECK_DECLS([group_from_gid, gid_from_group, pwcache_groupdb],,,[
 #include <grp.h>
 ])
-AC_CHECK_DECLS([strndup],,,[#include <string.h>])
+AC_CHECK_DECLS([strndup, strnlen],,,[#include <string.h>])
 AC_CHECK_DECLS([strsuftoll],,,[#include <stdlib.h>])
 AC_CHECK_DECLS([lchflags, lchmod, lchown],,,[
 #include <sys/stat.h>
 #include <unistd.h>
 ])
 
+AC_CHECK_DECLS([errc, verrc, warnc, vwarnc],,, [
+#ifdef HAVE_ERR_H
+#include <err.h>
+#endif
+])
+
 AC_CHECK_DECLS([htobe16, htobe32, htobe64, htole16, htole32, htole64,
 		be16toh, be32toh, be64toh, le16toh, le32toh, le64toh],,,
 		[#include <sys/types.h>])

tools/compat/dev/clock_subr.h

@@ -0,0 +1,55 @@
+/*	$NetBSD: clock_subr.h,v 1.3 2014/12/22 18:08:39 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1996 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Gordon W. Ross
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _DEV_CLOCK_SUBR_H_
+#define _DEV_CLOCK_SUBR_H_
+
+/*
+ * This is a slightly stripped down version of src/sys/dev/clock_subr.h
+ */
+
+/*
+ * "POSIX time" to/from "YY/MM/DD/hh/mm/ss"
+ */
+struct clock_ymdhms {
+	uint64_t dt_year;
+	u_char dt_mon;
+	u_char dt_day;
+	u_char dt_wday;	/* Day of week */
+	u_char dt_hour;
+	u_char dt_min;
+	u_char dt_sec;
+};
+
+time_t	clock_ymdhms_to_secs(struct clock_ymdhms *);
+int	clock_secs_to_ymdhms(time_t, struct clock_ymdhms *);
+
+#endif /* _DEV_CLOCK_SUBR_H_ */

tools/compat/fgetln.c

@@ -1,32 +1,23 @@
-/*	$NetBSD: fgetln.c,v 1.9 2008/04/29 06:53:03 martin Exp $	*/
+/*	$NetBSD: fgetln.c,v 1.12 2015/10/09 14:42:40 christos Exp $	*/
 
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) 2015 Joerg Jung <jung@openbsd.org>
  *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * portable fgetln() version
  */
 
 #ifdef HAVE_NBTOOL_CONFIG_H
@@ -38,58 +29,52 @@
 #ifndef HAVE_NBTOOL_CONFIG_H
 /* These headers are required, but included from nbtool_config.h */
 #include <stdio.h>
-#include <unistd.h>
+#include <stdlib.h>
 #include <errno.h>
-#include <string.h>
 #endif
 
 char *
 fgetln(FILE *fp, size_t *len)
 {
 	static char *buf = NULL;
-	static size_t bufsiz = 0;
-	char *ptr;
+	static size_t bufsz = 0;
+	size_t r = 0;
+	char *p;
+	int c, e;
 
-
-	if (buf == NULL) {
-		bufsiz = BUFSIZ;
-		if ((buf = malloc(bufsiz)) == NULL)
-			return NULL;
-	}
-
-	if (fgets(buf, bufsiz, fp) == NULL)
+	if (!fp || !len) {
+		errno = EINVAL;
 		return NULL;
-
-	*len = 0;
-	while ((ptr = strchr(&buf[*len], '\n')) == NULL) {
-		size_t nbufsiz = bufsiz + BUFSIZ;
-		char *nbuf = realloc(buf, nbufsiz);
-
-		if (nbuf == NULL) {
-			int oerrno = errno;
-			free(buf);
-			errno = oerrno;
-			buf = NULL;
-			return NULL;
-		} else
-			buf = nbuf;
-
-		if (fgets(&buf[bufsiz], BUFSIZ, fp) == NULL) {
-			buf[bufsiz] = '\0';
-			*len = strlen(buf);
-			return buf;
-		}
-
-		*len = bufsiz;
-		bufsiz = nbufsiz;
 	}
-
-	*len = (ptr - buf) + 1;
-	return buf;
+	if (!buf) {
+		if (!(buf = calloc(1, BUFSIZ)))
+			return NULL;
+		bufsz = BUFSIZ;
+	}
+	while ((c = getc(fp)) != EOF) {
+		buf[r++] = c;
+		if (r == bufsz) {
+			/*
+			 * Original uses reallocarray() but we don't have it
+			 * in tools.
+			 */
+			if (!(p = realloc(buf, 2 * bufsz))) {
+				e = errno;
+				free(buf);
+				errno = e;
+				buf = NULL, bufsz = 0;
+				return NULL;
+			}
+			buf = p, bufsz = 2 * bufsz;
+		}
+		if (c == '\n')
+			break;
+	}
+	return (*len = r) ? buf : NULL;
 }
-
 #endif
 
+
 #ifdef TEST
 int
 main(int argc, char *argv[])

tools/compat/getline.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: getline.c,v 1.1 2011/03/20 20:48:57 christos Exp $	*/
+/*	$NetBSD: getline.c,v 1.2 2014/09/16 17:23:50 christos Exp $	*/
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -59,10 +59,14 @@ getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp)
 	for (ptr = *buf, eptr = *buf + *bufsiz;;) {
 		int c = fgetc(fp);
 		if (c == -1) {
-			if (feof(fp))
-				return ptr == *buf ? -1 : ptr - *buf;
-			else
-				return -1;
+			if (feof(fp)) {
+				ssize_t diff = (ssize_t)(ptr - *buf);
+				if (diff != 0) {
+					*ptr = '\0';
+					return diff;
+				}
+			}
+			return -1;
 		}
 		*ptr++ = c;
 		if (c == delimiter) {

tools/compat/lchflags.c

@@ -32,7 +32,11 @@
 /* Emulate lchflags(2), checking path with lstat(2) first to ensure that
  * it's not a symlink, and then call chflags(2) */
 
+#if !defined(__minix) && !defined(_LIBC)
 #include "nbtool_config.h"
+#else
+#define HAVE_STRUCT_STAT_ST_FLAGS 1
+#endif /* !defined(__minix) && !defined(_LIBC) */
 
 #if !HAVE_LCHFLAGS && HAVE_STRUCT_STAT_ST_FLAGS
 #include <sys/stat.h>
@@ -49,10 +53,10 @@ lchflags(const char *path, u_long flags)
 	if (S_ISLNK(psb.st_mode)) {
 		return 0;
 	}
-#ifdef __minix
+#if defined(__minix)
 	return 0;
 #else
 	return (chflags(path, flags));
-#endif
+#endif /* defined(__minix) */
 }
 #endif

tools/compat/nbtool_config.h.in

@@ -1,6 +1,6 @@
 /* nbtool_config.h.in.  Generated automatically from configure.ac by autoheader.  */
 
-/*      $NetBSD: nbtool_config.h.in,v 1.33 2013/08/14 10:15:14 jmcneill Exp $    */
+/*      $NetBSD: nbtool_config.h.in,v 1.37 2015/07/26 14:01:53 kamil Exp $    */
  
 #ifndef __NETBSD_NBTOOL_CONFIG_H__
 #define __NETBSD_NBTOOL_CONFIG_H__
@@ -91,6 +91,10 @@
    don't. */
 #undef HAVE_DECL_BSWAP64
 
+/* Define to 1 if you have the declaration of `errc', and to 0 if you don't.
+   */
+#undef HAVE_DECL_ERRC
+
 /* Define to 1 if you have the declaration of `fstatvfs', and to 0 if you
    don't. */
 #undef HAVE_DECL_FSTATVFS
@@ -203,6 +207,10 @@
    don't. */
 #undef HAVE_DECL_STRNDUP
 
+/* Define to 1 if you have the declaration of `strnlen', and to 0 if you
+   don't. */
+#undef HAVE_DECL_STRNLEN
+
 /* Define to 1 if you have the declaration of `strsuftoll', and to 0 if you
    don't. */
 #undef HAVE_DECL_STRSUFTOLL
@@ -219,6 +227,18 @@
    don't. */
 #undef HAVE_DECL_USER_FROM_UID
 
+/* Define to 1 if you have the declaration of `verrc', and to 0 if you don't.
+   */
+#undef HAVE_DECL_VERRC
+
+/* Define to 1 if you have the declaration of `vwarnc', and to 0 if you don't.
+   */
+#undef HAVE_DECL_VWARNC
+
+/* Define to 1 if you have the declaration of `warnc', and to 0 if you don't.
+   */
+#undef HAVE_DECL_WARNC
+
 /* Define if you have the `devname' function. */
 #undef HAVE_DEVNAME
 
@@ -399,6 +419,9 @@
 /* Define if you have the `random' function. */
 #undef HAVE_RANDOM
 
+/* Define if you have the `reallocarr' function. */
+#undef HAVE_REALLOCARR
+
 /* Define if you have the <resolv.h> header file. */
 #undef HAVE_RESOLV_H
 
@@ -462,15 +485,24 @@
 /* Define if you have the `strndup' function. */
 #undef HAVE_STRNDUP
 
+/* Define if you have the `strnlen' function. */
+#undef HAVE_STRNLEN
+
 /* Define if you have the `strsep' function. */
 #undef HAVE_STRSEP
 
 /* Define if you have the `strsuftoll' function. */
 #undef HAVE_STRSUFTOLL
 
+/* Define if you have the `strtoi' function. */
+#undef HAVE_STRTOI
+
 /* Define if you have the `strtoll' function. */
 #undef HAVE_STRTOLL
 
+/* Define if you have the `strtou' function. */
+#undef HAVE_STRTOU
+
 /* Define if `d_namlen' is member of `struct dirent'. */
 #undef HAVE_STRUCT_DIRENT_D_NAMLEN
 

tools/compat/nl_types.h

@@ -1,6 +1,6 @@
-/*	$NetBSD: nl_types.h,v 1.1 2002/01/29 10:20:32 tv Exp $	*/
+/*	$NetBSD: nl_types.h,v 1.3 2014/11/12 15:08:52 joerg Exp $	*/
 
-#ifdef _NLS_PRIVATE
+#if defined(_NLS_PRIVATE)
 
 /* #if defined(__minix) */
 /* <sys/cdefs> defines __format_arg, but on some other platforms it doesn't.
@@ -12,4 +12,6 @@
 /* #endif defined(__minix) */
 
 #include "../../include/nl_types.h"
+#elif defined(__GNUC__)
+#include_next <nl_types.h>
 #endif